Menu
▾
▴
morphix-cvs — A list for all cvs commits done, to easily keep track of development
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(23) |
Nov
(20) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(43) |
Feb
(31) |
Mar
(99) |
Apr
(57) |
May
(82) |
Jun
(73) |
Jul
(123) |
Aug
(634) |
Sep
(588) |
Oct
(264) |
Nov
(217) |
Dec
(179) |
| 2005 |
Jan
(262) |
Feb
(273) |
Mar
(164) |
Apr
(88) |
May
(23) |
Jun
(10) |
Jul
(8) |
Aug
(19) |
Sep
(112) |
Oct
(57) |
Nov
(71) |
Dec
(6) |
| 2006 |
Jan
(14) |
Feb
(48) |
Mar
(56) |
Apr
(21) |
May
(77) |
Jun
(46) |
Jul
(47) |
Aug
(27) |
Sep
(18) |
Oct
(16) |
Nov
(4) |
Dec
(18) |
| 2007 |
Jan
(2) |
Feb
(6) |
Mar
(2) |
Apr
(27) |
May
(13) |
Jun
(27) |
Jul
(20) |
Aug
(3) |
Sep
(3) |
Oct
(23) |
Nov
(21) |
Dec
(6) |
| 2008 |
Jan
(7) |
Feb
(3) |
Mar
(4) |
Apr
(8) |
May
(3) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(11) |
Feb
(1) |
Mar
(8) |
Apr
|
May
|
Jun
(4) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <bms...@us...> - 2007-07-16 20:32:30
|
Revision: 2541
http://svn.sourceforge.net/morphix/?rev=2541&view=rev
Author: bmsleight
Date: 2007-07-16 13:31:56 -0700 (Mon, 16 Jul 2007)
Log Message:
-----------
Work in progress
Added Paths:
-----------
trunk/scripts-mini/MorphixMini-KioskSetting.xml.pre
Added: trunk/scripts-mini/MorphixMini-KioskSetting.xml.pre
===================================================================
--- trunk/scripts-mini/MorphixMini-KioskSetting.xml.pre (rev 0)
+++ trunk/scripts-mini/MorphixMini-KioskSetting.xml.pre 2007-07-16 20:31:56 UTC (rev 2541)
@@ -0,0 +1,23 @@
+<comps>
+ <group>
+ <minimod>
+ <version>0.04</version>
+ <description>MorphMini to set the persistent application and set/restore kiosk extension</description>
+ <minitag>MorphixMiniKioskSetting</minitag>
+ <maintag>matchbox</maintag>
+ <bootoption>ALL</bootoption>
+ <commandlist>
+ <preX>
+ <!-- Comment out if you do not want the simple Navigation Bar -->
+ COMMENTOUTNAVBAR<command>echo 'pref("rkiosk.navbar", true);' >> /etc/iceweasel/pref/iceweasel.js </command> ECOMMENTOUTNAVBAR
+ <command>echo 'pref("browser.startup.homepage", "http://HOMEPAGE");' >> /etc/iceweasel/pref/iceweasel.js </command>
+ </preX>
+ <X> <!-- Before each time firefox is launched, delete the old user setting and restore saved setting -->
+ <command>echo "rm ~/.mozilla/ -R " >> ~/.persistent-app </command>
+ <command>echo "firefox " >> ~/.persistent-app </command>
+ <command>echo "killall firefox-bin " >> ~/.inactivity </command>
+ </X>
+ </commandlist>
+ </minimod>
+ </group>
+</comps>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-07-16 20:32:26
|
Revision: 2540
http://svn.sourceforge.net/morphix/?rev=2540&view=rev
Author: bmsleight
Date: 2007-07-16 13:31:12 -0700 (Mon, 16 Jul 2007)
Log Message:
-----------
Work in progress
Modified Paths:
--------------
trunk/morph-scripts/mmorphix/MorphixMini-MMG_Templates.xml
trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
Added Paths:
-----------
trunk/morph-scripts/mmorphix/MorphixMini-Welcome-MM.xml
Modified: trunk/morph-scripts/mmorphix/MorphixMini-MMG_Templates.xml
===================================================================
--- trunk/morph-scripts/mmorphix/MorphixMini-MMG_Templates.xml 2007-07-15 14:37:37 UTC (rev 2539)
+++ trunk/morph-scripts/mmorphix/MorphixMini-MMG_Templates.xml 2007-07-16 20:31:12 UTC (rev 2540)
@@ -1,51 +1,46 @@
<comps>
<group>
<minimod>
- <version>0.1</version>
+ <version>0.2</version>
<description>MorphMini Morphing Morphix GUI Templates</description>
- <minitag>templates</minitag>
+ <minitag>MorphingMorphix-Templates</minitag>
<maintag>ALL</maintag>
- <bootoption>ALL</bootoption> <!-- Only run the minimodule when this bootoption is used. Special case run ALL the time-->
- <root> <!-- Files or Packages to be overlaid on the rootfile system - good for saving ramspace -->
+ <bootoption>ALL</bootoption>
+ <root>
<files>
- <!-- Remote svn access not working at the moment> -->
- <local>
- <from>/home/morph/morphix/trunk/morph-scripts/mmorphix/MorphixMini-MMG_Templates.xml</from>
+ <remote>
+ <from>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/morph-scripts/mmorphix/MorphixMini-MMG_Templates.xml</from>
<to>/usr/share/morphing-morphix/</to>
- </local>
- <local>
- <from>/home/morph/morphix/trunk/morph-scripts/mmorphix/MorphixMini-Launch-MM-GUI.remote.xml</from>
+ </remote>
+ <remote>
+ <from>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/morph-scripts/mmorphix/MorphixMini-Welcome-MM.xml</from>
<to>/usr/share/morphing-morphix/MorphixMini-Launch-MM-GUI.xml</to>
- </local>
- <local>
- <from>/home/morph/morphix/trunk/mmaker/templates/morphing-morphix.xml</from>
- <to>/usr/share/morphing-morphix/</to>
- </local>
+ </remote>
<!-- Templates for building MorphixLiveKiosk -->
- <local>
- <from>/home/morph/morphix/trunk/mmaker/templates/basemod-2.6.15.xml</from>
+ <remote>
+ <from>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/mmaker/templates/basemod-2.6.15.xml</from>
<to>/usr/share/morphing-morphix/</to>
- </local>
- <local>
- <from>/home/morph/morphix/trunk/mmaker/templates/morphix-livekiosk.xml</from>
+ </remote>
+ <remote>
+ <from>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/mmaker/templates/morphix-livekiosk.xml</from>
<to>/usr/share/morphing-morphix/</to>
- </local>
- <local>
- <from>/home/morph/morphix/trunk/scripts-mini/MorphixMini-KioskSetting.xml</from>
+ </remote>
+ <remote>
+ <from>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/scripts-mini/MorphixMini-KioskSetting.xml.pre</from>
<to>/usr/share/morphing-morphix/</to>
- </local>
- <local>
- <from>/home/morph/morphix/trunk/scripts-mini/MorphixMini-KioskAddins.xml</from>
+ </remote>
+ <remote>
+ <from>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/scripts-mini/MorphixMini-NonFree-FlashPlugin.xml</from>
<to>/usr/share/morphing-morphix/</to>
- </local>
- <local>
- <from>/home/morph/morphix/trunk/morph-scripts/mmorphix/MorphixMini-MMG_Templates.xml</from>
+ </remote>
+ <remote>
+ <from>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/scripts-mini/MorphixMini-NonFree-Java.xml</from>
<to>/usr/share/morphing-morphix/</to>
- </local>
- <local>
- <from>/home/morph/morphix/trunk/how_tos/images/MorphixLiveKiosk.png</from>
+ </remote>
+ <remote>
+ <from>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/how_tos/images/MorphixLiveKiosk.png</from>
<to>/usr/share/morphing-morphix/</to>
- </local>
+ </remote>
</files>
</root>
</minimod>
Added: trunk/morph-scripts/mmorphix/MorphixMini-Welcome-MM.xml
===================================================================
--- trunk/morph-scripts/mmorphix/MorphixMini-Welcome-MM.xml (rev 0)
+++ trunk/morph-scripts/mmorphix/MorphixMini-Welcome-MM.xml 2007-07-16 20:31:12 UTC (rev 2540)
@@ -0,0 +1,24 @@
+<comps>
+ <group>
+ <minimod>
+ <version>0.0.1</version>
+ <description>Welcome to Morphing Morphix</description>
+ <minitag>Welcome-to-MorphingMorphix</minitag>
+ <maintag>ALL</maintag>
+ <bootoption>ALL</bootoption>
+ <root> <!-- Files or Packages to be overlaid on the rootfile system - good for saving ramspace -->
+ <files>
+ <remote>
+ <from>http://www.barwap.com/morphix/mmorphix/morphixsound.wav</from>
+ <to>/usr/share/morphing-morphix/</to>
+ </remote>
+ </files>
+ </root>
+ <commandlist>
+ <X>
+ <command>aplay /usr/share/morphing-morphix/morphixsound.wav</command>
+ </X>
+ </commandlist>
+ </minimod>
+ </group>
+</comps>
Modified: trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
===================================================================
--- trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh 2007-07-15 14:37:37 UTC (rev 2539)
+++ trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh 2007-07-16 20:31:12 UTC (rev 2540)
@@ -343,24 +343,24 @@
###########################################################
MESSAGE_MINIMORPH_1="MiniMorph Example
-The next Morph is making the MiniModule to auto run an
-application once the window manager has loaded.
+The next Morph is making the MiniModule to auto run
+something once the window manager has loaded.
This Morph is to demonstrate the use of one of the morphix
tools - morphmini. This is mmaker's little brother. As in
other examples this makes use of XML template files."
MESSAGE_MINIMORPH_2="MiniMorph Example
-MorphixMini-Launch-MM-GUI.xml"
+MorphixMini-Welcome-MM.xml"
MESSAGE_MINIMORPH_3="MiniMorph Example
We will now build the MiniModule then add the MiniModule to
the the LiveCD.
-morphmini ./MorphixMini-Launch-MM-GUI.xml
- ./MorphixMini-Launch-MM-GUI.mod
+morphmini ./MorphixMini-Welcome-MM.xml
+ ./MorphixMini-Welcome-MM.mod
-isomorph --add mini ./MorphixMini-Launch-MM-GUI.mod
+isomorph --add mini ./MorphixMini-Welcome-MM.xml
./MyMorph.iso ./tmp.iso
mv ./tmp.iso ./MyMorph.iso"
@@ -1122,13 +1122,13 @@
then
log_file "build_minimodule"
xdialog_message "$MESSAGE_MINIMORPH_1"
- xdialog_tail_box "$MESSAGE_MINIMORPH_2" "/usr/share/morphing-morphix/MorphixMini-Launch-MM-GUI.xml"
- edit_xml_template "/usr/share/morphing-morphix/MorphixMini-Launch-MM-GUI.xml"
+ xdialog_tail_box "$MESSAGE_MINIMORPH_2" "/usr/share/morphing-morphix/MorphixMini-Welcome-MM.xml"
+ edit_xml_template "/usr/share/morphing-morphix/MorphixMini-Welcome-MM.xml"
xdialog_message "$MESSAGE_MINIMORPH_3"
- log_and_do_command_progress_pause "sudo morphmini /usr/share/morphing-morphix/MorphixMini-Launch-MM-GUI.xml
- /tmp/MorphixMini-Launch-MM-GUI.mod"
+ log_and_do_command_progress_pause "sudo morphmini /usr/share/morphing-morphix/MorphixMini-Welcome-MM.xml
+ /tmp/MorphixMini-Welcome-MM.mod"
log_and_do_command_progress_pause "sudo isomorph --add mini
- /tmp/MorphixMini-Launch-MM-GUI.mod
+ /tmp/MorphixMini-Welcome-MM.mod
$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-07-15 14:37:39
|
Revision: 2539
http://svn.sourceforge.net/morphix/?rev=2539&view=rev
Author: bmsleight
Date: 2007-07-15 07:37:37 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
Allow MiniModule to set homepage
Modified Paths:
--------------
trunk/scripts-mini/MorphixMini-KioskSetting.xml
Modified: trunk/scripts-mini/MorphixMini-KioskSetting.xml
===================================================================
--- trunk/scripts-mini/MorphixMini-KioskSetting.xml 2007-07-15 14:36:37 UTC (rev 2538)
+++ trunk/scripts-mini/MorphixMini-KioskSetting.xml 2007-07-15 14:37:37 UTC (rev 2539)
@@ -1,7 +1,7 @@
<comps>
<group>
<minimod>
- <version>0.1.0</version>
+ <version>0.04</version>
<description>MorphMini to set the persistent application and set/restore kiosk extension</description>
<minitag>MorphixMiniKioskSetting</minitag>
<maintag>matchbox</maintag>
@@ -10,12 +10,11 @@
<preX>
<!-- Comment out if you do not want the simple Navigation Bar -->
<command>echo 'pref("rkiosk.navbar", true);' >> /etc/iceweasel/pref/iceweasel.js </command>
- <!-- Get ip adress via dhcp -->
- <command>dhclient >/dev/null 2>&1 &</command> <!-- > is xml for > and & is xml for & -->
+ <command>echo 'pref("browser.startup.homepage", "http://www.morphix.org");' >> /etc/iceweasel/pref/iceweasel.js </command>
</preX>
<X> <!-- Before each time firefox is launched, delete the old user setting and restore saved setting -->
- <command>echo "rm ~/.mozilla/ -R " >> ~/.persistent-app </command>
- <command>echo "firefox http://www.morphix.org " >> ~/.persistent-app </command>
+ <command>echo "rm ~/.mozilla/ -R " >> ~/.persistent-app </command>
+ <command>echo "firefox " >> ~/.persistent-app </command>
<command>echo "killall firefox-bin " >> ~/.inactivity </command>
</X>
</commandlist>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-07-15 14:36:42
|
Revision: 2538
http://svn.sourceforge.net/morphix/?rev=2538&view=rev
Author: bmsleight
Date: 2007-07-15 07:36:37 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
Minor man page updates
Modified Paths:
--------------
trunk/morph-scripts/debian/add_to_iso.1
trunk/morph-scripts/debian/isomorph.1
trunk/morph-scripts/debian/make-iso.1
trunk/morph-scripts/debian/minimod-gen.1
trunk/morph-scripts/debian/module-builder.1
trunk/morph-scripts/debian/module-extractor.1
trunk/morph-scripts/debian/morphix-chroot.1
trunk/morph-scripts/debian/morphix-rebrand.1
trunk/morph-scripts/debian/morphmini.1
Modified: trunk/morph-scripts/debian/add_to_iso.1
===================================================================
--- trunk/morph-scripts/debian/add_to_iso.1 2007-07-15 14:35:02 UTC (rev 2537)
+++ trunk/morph-scripts/debian/add_to_iso.1 2007-07-15 14:36:37 UTC (rev 2538)
@@ -1,11 +1,11 @@
.\" Title: add_to_iso
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\" Date: 04/12/2007
+.\" Date: 07/02/2007
.\" Manual:
.\" Source:
.\"
-.TH "ADD_TO_ISO" "1" "04/12/2007" "" ""
+.TH "ADD_TO_ISO" "1" "07/02/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Modified: trunk/morph-scripts/debian/isomorph.1
===================================================================
--- trunk/morph-scripts/debian/isomorph.1 2007-07-15 14:35:02 UTC (rev 2537)
+++ trunk/morph-scripts/debian/isomorph.1 2007-07-15 14:36:37 UTC (rev 2538)
@@ -1,11 +1,11 @@
.\" Title: isomorph
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\" Date: 04/12/2007
+.\" Date: 07/02/2007
.\" Manual:
.\" Source:
.\"
-.TH "ISOMORPH" "1" "04/12/2007" "" ""
+.TH "ISOMORPH" "1" "07/02/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
@@ -29,50 +29,28 @@
This script manipulates a morphix iso. Modular parts are added, deleted extracted or listed from the iso.
.sp
.SH "OPTIONS"
-.PP
-\fI\-\-add\fR [OPTIONS\&...] [ file | file path | option ] OLDISO NEWISO
+.sp
.RS 4
-Add modular parts to the
-\fIOLDISO\fR
-making a
-\fINEWISO\fR
-.PP
-\fIbase BASEMODULE OLDISO NEWISO\fR
-.RS 4
-replace basemodule
+.nf
+\'\-\-add' [OPTIONS...] [ file | file path | option ] OLDISO NEWISO ::
+ Add modular parts to the 'OLDISO' making a 'NEWISO'
+ 'base BASEMODULE OLDISO NEWISO';;
+ replace basemodule
+ 'main MAINMODULE OLDISO NEWISO';;
+ add mainmodule
+ 'mini MINIMODULE OLDISO NEWISO';;
+ add minimodule
+ 'deb DEBPACKAGE OLDISO NEWISO';;
+ add debian package
+ 'exec SHELLSCRIPT OLDISO NEWISO';;
+ add script
+ 'copy FILE PATH OLDISO NEWISO';;
+ add file in path
+ 'boot "Boot Option" OLDISO NEWISO';;
+ add boot option
+.fi
.RE
.PP
-\fImain MAINMODULE OLDISO NEWISO\fR
-.RS 4
-add mainmodule
-.RE
-.PP
-\fImini MINIMODULE OLDISO NEWISO\fR
-.RS 4
-add minimodule
-.RE
-.PP
-\fIdeb DEBPACKAGE OLDISO NEWISO\fR
-.RS 4
-add debian package
-.RE
-.PP
-\fIexec SHELLSCRIPT OLDISO NEWISO\fR
-.RS 4
-add script
-.RE
-.PP
-\fIcopy FILE PATH OLDISO NEWISO\fR
-.RS 4
-add file in path
-.RE
-.PP
-\fIboot "Boot Option" OLDISO NEWISO\fR
-.RS 4
-add boot option
-.RE
-.RE
-.PP
\fI\-\-del\fR [OPTIONS\&...] [ file | file path | option ] OLDISO NEWISO
.RS 4
Delete modular parts from the
Modified: trunk/morph-scripts/debian/make-iso.1
===================================================================
--- trunk/morph-scripts/debian/make-iso.1 2007-07-15 14:35:02 UTC (rev 2537)
+++ trunk/morph-scripts/debian/make-iso.1 2007-07-15 14:36:37 UTC (rev 2538)
@@ -1,11 +1,11 @@
.\" Title: make-iso
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\" Date: 04/12/2007
+.\" Date: 07/02/2007
.\" Manual:
.\" Source:
.\"
-.TH "MAKE\-ISO" "1" "04/12/2007" "" ""
+.TH "MAKE\-ISO" "1" "07/02/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Modified: trunk/morph-scripts/debian/minimod-gen.1
===================================================================
--- trunk/morph-scripts/debian/minimod-gen.1 2007-07-15 14:35:02 UTC (rev 2537)
+++ trunk/morph-scripts/debian/minimod-gen.1 2007-07-15 14:36:37 UTC (rev 2538)
@@ -1,11 +1,11 @@
.\" Title: minimod-gen
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\" Date: 04/12/2007
+.\" Date: 07/02/2007
.\" Manual:
.\" Source:
.\"
-.TH "MINIMOD\-GEN" "1" "04/12/2007" "" ""
+.TH "MINIMOD\-GEN" "1" "07/02/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
@@ -19,7 +19,6 @@
.PP
Interactive commandline tool for building a minimodule. Interactive menu
.RS 4
-
.sp
.RS 4
\h'-04' 1.\h'+02'Copy a file/dir to the mainmod at boot, or overwrite one if it exists
Modified: trunk/morph-scripts/debian/module-builder.1
===================================================================
--- trunk/morph-scripts/debian/module-builder.1 2007-07-15 14:35:02 UTC (rev 2537)
+++ trunk/morph-scripts/debian/module-builder.1 2007-07-15 14:36:37 UTC (rev 2538)
@@ -1,11 +1,11 @@
.\" Title: module-builder
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\" Date: 04/12/2007
+.\" Date: 07/02/2007
.\" Manual:
.\" Source:
.\"
-.TH "MODULE\-BUILDER" "1" "04/12/2007" "" ""
+.TH "MODULE\-BUILDER" "1" "07/02/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Modified: trunk/morph-scripts/debian/module-extractor.1
===================================================================
--- trunk/morph-scripts/debian/module-extractor.1 2007-07-15 14:35:02 UTC (rev 2537)
+++ trunk/morph-scripts/debian/module-extractor.1 2007-07-15 14:36:37 UTC (rev 2538)
@@ -1,11 +1,11 @@
.\" Title: module-extractor
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\" Date: 04/12/2007
+.\" Date: 07/02/2007
.\" Manual:
.\" Source:
.\"
-.TH "MODULE\-EXTRACTOR" "1" "04/12/2007" "" ""
+.TH "MODULE\-EXTRACTOR" "1" "07/02/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Modified: trunk/morph-scripts/debian/morphix-chroot.1
===================================================================
--- trunk/morph-scripts/debian/morphix-chroot.1 2007-07-15 14:35:02 UTC (rev 2537)
+++ trunk/morph-scripts/debian/morphix-chroot.1 2007-07-15 14:36:37 UTC (rev 2538)
@@ -1,11 +1,11 @@
.\" Title: morphix-chroot
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\" Date: 04/12/2007
+.\" Date: 07/02/2007
.\" Manual:
.\" Source:
.\"
-.TH "MORPHIX\-CHROOT" "1" "04/12/2007" "" ""
+.TH "MORPHIX\-CHROOT" "1" "07/02/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Modified: trunk/morph-scripts/debian/morphix-rebrand.1
===================================================================
--- trunk/morph-scripts/debian/morphix-rebrand.1 2007-07-15 14:35:02 UTC (rev 2537)
+++ trunk/morph-scripts/debian/morphix-rebrand.1 2007-07-15 14:36:37 UTC (rev 2538)
@@ -1,11 +1,11 @@
.\" Title: morphix_rebrand
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\" Date: 04/12/2007
+.\" Date: 07/02/2007
.\" Manual:
.\" Source:
.\"
-.TH "MORPHIX_REBRAND" "1" "04/12/2007" "" ""
+.TH "MORPHIX_REBRAND" "1" "07/02/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Modified: trunk/morph-scripts/debian/morphmini.1
===================================================================
--- trunk/morph-scripts/debian/morphmini.1 2007-07-15 14:35:02 UTC (rev 2537)
+++ trunk/morph-scripts/debian/morphmini.1 2007-07-15 14:36:37 UTC (rev 2538)
@@ -1,11 +1,11 @@
.\" Title: morphmini
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\" Date: 04/12/2007
+.\" Date: 07/02/2007
.\" Manual:
.\" Source:
.\"
-.TH "MORPHMINI" "1" "04/12/2007" "" ""
+.TH "MORPHMINI" "1" "07/02/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-07-15 14:35:07
|
Revision: 2537
http://svn.sourceforge.net/morphix/?rev=2537&view=rev
Author: bmsleight
Date: 2007-07-15 07:35:02 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
Work in progress
Modified Paths:
--------------
trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
Modified: trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
===================================================================
--- trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh 2007-07-15 14:33:27 UTC (rev 2536)
+++ trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh 2007-07-15 14:35:02 UTC (rev 2537)
@@ -64,6 +64,9 @@
SETTING_LOG_COMMANDS=~/mmscript.sh
SETTING_MYMORPH="MyMorph.iso"
SETTING_MYMORPH_MAIN="morphing-morphix.mod"
+ SETTING_CURRENT_BASE="http://surfnet.dl.sourceforge.net/sourceforge/morphix/MorphixBase-0.5-pre6.iso"
+ SETTING_CURRENT_MLK="http://www.barwap.com/morphix/livekiosk/MorphixLiveKiosk.mod"
+ SETTING_MY_MLK="MyMLK.iso"
TMP_FILE=/tmp/mmorphix.$$
TMP_FILE_2=/tmp/mmorphix_.$$
TMP_SCRIPT=/tmp/mmorphix.$$.sh
@@ -233,8 +236,8 @@
MESSAGE_HELP_TITLE="MorphingMorphix Help"
MESSAGE_MAIN_MENU="Welcome to MorphingMorphix"
MESSAGE_MAIN_MENU_1="Submenu [Configure MorphingMorphix]"
-MESSAGE_MAIN_MENU_2="Introduction to isomorph"
-MESSAGE_MAIN_MENU_3="Using isomorph to get a clean base"
+MESSAGE_MAIN_MENU_2="Submenu [Isomorph examples]"
+MESSAGE_MAIN_MENU_3="Building a Customized MorphixLiveKiosk"
MESSAGE_MAIN_MENU_4="Submenu [MiniModules]"
MESSAGE_MAIN_MENU_5="Submenu [MainModules]"
MESSAGE_MAIN_MENU_6="Rebranding a Morphix LiveCD"
@@ -245,6 +248,9 @@
MESSAGE_CONFIGURE_MENU="$MESSAGE_MAIN_MENU_1"
MESSAGE_CONFIGURE_MENU_1="Configure MorphingMorphix"
MESSAGE_CONFIGURE_MENU_2="Remove old CD Images then complete Configuration"
+MESSAGE_ISOMORPH_MENU="$MESSAGE_MAIN_MENU_2"
+MESSAGE_ISOMORPH_MENU_1="Introduction to isomorph"
+MESSAGE_ISOMORPH_MENU_2="Using isomorph to get a clean base"
MESSAGE_MINIMODS_MENU="$MESSAGE_MAIN_MENU_4"
MESSAGE_MINIMODS_MENU_1="Using a XML template to build a MiniModule"
MESSAGE_MINIMODS_MENU_2="Saving the Home Directory to a MiniModule "
@@ -267,8 +273,10 @@
###########################################################
MESSAGE_SETTING_MAKEISO="Setting up Morphing Morphix
-We need to make a iso image for us to morph
-We will use this CD and call the image MyMorph.iso"
+We need a base ISO as a starting point for morphing.
+The easiest way is to download one of the pre-build bases
+available from Morphix.org.
+We will call the image MyMorph.iso"
###########################################################
MESSAGE_SETTING_TMPFS="Setting up Morphing Morphix
@@ -293,6 +301,46 @@
For example we will now run the command :-
isomorph --list MyMorph.iso"
###########################################################
+MESSAGE_BUILD_MLK_1="Building MorphixLiveKiosk
+
+This morph is to build a new MorphixLiveKiosk
+
+It is a straight forward process.
+ - Download the MainModule
+ - Make a MiniModule for the Kiosk Setting
+ - If required build the non-free MiniModules
+ - Add all of the above to the base
+ - Rebrand the ISO"
+###########################################################
+MESSAGE_BUILD_MLK_2="Building MorphixLiveKiosk
+
+Default homepage for MorphixLiveKiosk ?"
+###########################################################
+MESSAGE_BUILD_MLK_3="Building MorphixLiveKiosk
+
+Should the Navigation toolbar be visible ?"
+###########################################################
+MESSAGE_BUILD_MLK_4="Building MorphixLiveKiosk
+
+Do you want to build the non-Free MiniModules which
+contains Non-GPL software; flash and java plugins ?"
+###########################################################
+MESSAGE_BUILD_MLK_5="Building MorphixLiveKiosk
+
+New step is to select a graphics file which will be used
+for rebranding by changing the following:-
+ * Grub Titles - shown on booting
+ * Grub Background - shown on booting
+ * Username, Hostname
+ * Boot-up messages
+ * Boot-up backgrounds
+ * Main Wallpaper
+
+Any Graphic file will do. Rebrand.png, Rebrand.jpg or
+Rebrand.gif The name of the graphics file is important as
+the script takes Rebrand as the new title for the part of
+the LiveCD."
+###########################################################
MESSAGE_MINIMORPH_1="MiniMorph Example
The next Morph is making the MiniModule to auto run an
@@ -323,26 +371,16 @@
###########################################################
MESSAGE_REMOVE_MODS="Remove Modules
-We have now got our CD Image file, by copying this running
-CD. As you have seen in the last example, this image
-contains the MainModule and lots of MiniModules. The easy
-way to make a new LiveCD is to build new MiniModules and a
-new MainModule.
+We can use the tool isomorph to add and remove parts of
+LiveCD.
-Hence the first task is to delete the MainModule and
-MiniModules from the LiveCD image."
-MESSAGE_REMOVE_MODS_1="Remove Modules
+A simple example is to use isomorph remove all the
+MainModules, MiniModules and other additions from the
+LiveCD to get back to a nice clean base.
-We will again use isomorph
-
-isomorph --del-all main ./MyMorph.iso ./tmp.iso
+isomorph --del-all ./MyMorph.iso ./tmp.iso
mv ./tmp.iso ./MyMorph.iso
-isomorph --del-all mini ./MyMorph.iso ./tmp.iso
-mv ./tmp.iso ./MyMorph.iso"
-MESSAGE_REMOVE_MODS_2="Remove Modules
-We can now choose option 2 (isomorph --list) and confirm
-that the MainModule and MiniModules have been removed from
-the LiveCD"
+isomorph --list ./MyMorph.iso"
###########################################################
MESSAGE_MAKE_MINI="Saving files in /home/morph
@@ -780,10 +818,10 @@
configure_mm_submenu;;
2)
log_file "main_menu selected $?"
- isomorph_intro;;
+ isomorph_submenu;;
3)
log_file "main_menu selected $?"
- remove_main_and_minis;;
+ custom_mlk;;
4)
log_file "main_menu selected $?"
minimodules_submenu;;
@@ -821,7 +859,7 @@
1)
set_up_mmorphix;;
2)
-
+ remove_images
set_up_mmorphix;;
3)
main_menu;;
@@ -835,6 +873,28 @@
esac
}
+isomorph_submenu ()
+{
+xdialog_menu "$MESSAGE_ISOMORPH_MENU" \
+ '$MESSAGE_ISOMORPH_MENU_1' '$MESSAGE_ISOMORPH_MENU_2'\
+ '$MESSAGE_MAIN_MENU_RETURN'
+ case $? in
+ 1)
+ isomorph_intro;;
+ 2)
+ remove_main_and_minis;;
+ 3)
+ main_menu;;
+ 254)
+ xdialog_message "$MESSAGE_HELP"
+ xdialog_message "$MESSAGE_HELP_2"
+ xdialog_message "$MESSAGE_HELP_3"
+ configure_mm_submenu;;
+ 255)
+ closing_mmorphix "isomorph_submenu";;
+ esac
+}
+
minimodules_submenu ()
{
xdialog_menu "$MESSAGE_MINIMODS_MENU" \
@@ -944,11 +1004,8 @@
log_file "Images exist"
else
xdialog_message "$MESSAGE_SETTING_MAKEISO"
- log_and_do_command "sudo dd if=/dev/cdrom \
- of=$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH >$TMP_FILE 2>&1 &"
- sleep 4
- log_and_do_command_progress "while pidof dd >/dev/null; do sudo kill -USR1 $(pidof dd); \
- tail -n 1 $TMP_FILE; sleep 2; done"
+ log_and_do_command_progress_pause "wget --output-document=$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH \
+ $SETTING_CURRENT_BASE"
fi
if [ "$MM_IS_SET_UP" = "" ]
then
@@ -987,7 +1044,7 @@
remove_images ()
{
- log_and_do_command "rm -f $MNT_POINT/mmorphix/iso/*"
+ log_and_do_command_progress_pause "rm -f $MNT_POINT/mmorphix/iso/*"
}
is_mmorphix_set_up ()
@@ -1040,15 +1097,11 @@
log_file "remove_main_and_minis"
# MESSAGE_REMOVE_MODS
xdialog_message "$MESSAGE_REMOVE_MODS"
- xdialog_message "$MESSAGE_REMOVE_MODS_1"
- log_and_do_command_progress_pause "sudo isomorph --del-all main
+ log_and_do_command_progress_pause "sudo isomorph --del-all
$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
- log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
- log_and_do_command_progress_pause "sudo isomorph --del-all mini
- $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
- log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
- xdialog_message "$MESSAGE_REMOVE_MODS_2"
-
+ log_and_do_command_progress_pause "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
+ log_and_do_command_progress_pause "sudo isomorph --list
+ $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH "
fi
main_menu
}
@@ -1132,7 +1185,7 @@
0)
log_and_do_command_progress_pause "sudo mmaker
/usr/share/morphing-morphix/morphing-morphix.xml
- /tmp/$SETTING_MYMORPH_MAIN"
+ /tmp/$"
log_and_do_command_progress_pause "sudo isomorph --add main
/tmp/morphing-morphix.mod
$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
@@ -1322,6 +1375,90 @@
###########################################################
# #
+# SECTION 19 : BUILD A CUSTOM MORPHIXLIVEKIOSK #
+# #
+# o Download, Build minis, pack - enjoy #
+# #
+###########################################################
+custom_mlk ()
+{
+is_mmorphix_set_up
+ if [ "$?" = "1" ]
+ then
+ log_file "custom_mlk"
+ xdialog_message "$MESSAGE_BUILD_MLK_1"
+ xdialog_input "$MESSAGE_BUILD_MLK" "$MESSAGE_BUILD_MLK_2" "www.morphix.org"
+ HOMEPAGE="$RETURN_VALUE"
+ xdialog_yes_no "$MESSAGE_BUILD_MLK_3"
+ case $? in
+ 0)
+ log_file "See nav toolbar"
+ ECOMMENT_OUT=""
+ COMMENT_OUT="";;
+ 1)
+ log_file "Do not see nav toolbar"
+ ECOMMENT_OUT="-->"
+ COMMENT_OUT="\!--";;
+ 255)
+ closing_mmorphix "custom_mlk";;
+ esac
+ xdialog_yes_no "$MESSAGE_BUILD_MLK_4"
+ case $? in
+ 0)
+ log_file "Non GPL MM"
+ NONFREEMM="YES";;
+ 1)
+ log_file "They will never take our freedom"
+ NONFREEMM="";;
+ 255)
+ closing_mmorphix "custom_mlk";;
+ esac
+ xdialog_file_select "$MESSAGE_BUILD_MLK_5" "$MNT_POINT"
+ REBRAND_GRAPHIC="$RETURN_VALUE"
+ log_and_do_command_progress_pause "wget --output-document=$MNT_POINT/mmorphix/morphed/MorphixLiveKiosk.mod \
+ $SETTING_CURRENT_MLK"
+ sed -e s/ECOMMENTOUTNAVBAR/$ECOMMENTOUT/g /usr/share/morphing-morphix/MorphixMini-KioskSetting.xml.pre >$TMP_FILE
+ sed -e s/COMMENTOUTNAVBAR/$COMMENT_OUT/g $TMP_FILE >$TMP_FILE_2
+ sudo sed -e s/HOMEPAGE/$HOMEPAGE/g /usr/share/morphing-morphix/MorphixMini-KioskSetting.xml
+ log_and_do_command_progress_pause "sudo morphmini /usr/share/morphing-morphix/MorphixMini-KioskSetting.xml \
+ $MNT_POINT/mmorphix/morphed/MorphixMini-KioskSetting.mod"
+ if [ "$NONFREEMM" = "YES" ]
+ then
+ log_and_do_command_progress_pause "sudo morphmini /usr/share/morphing-morphix/MorphixMini-NonFree-FlashPlugin.xml \
+ $MNT_POINT/mmorphix/morphed/MorphixMini-NonFree-FlashPlugin.mod"
+ log_and_do_command_progress_pause "sudo morphmini /usr/share/morphing-morphix/MorphixMini-NonFree-Java.xml \
+ $MNT_POINT/mmorphix/morphed/MorphixMini-NonFree-Java.mod"
+ fi
+ log_and_do_command_progress_pause "sudo isomorph --add main
+ $MNT_POINT/mmorphix/morphed/MorphixLiveKiosk.mod
+ $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
+ log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
+ log_and_do_command_progress_pause "sudo isomorph --add mini
+ $MNT_POINT/mmorphix/morphed/MorphixMini-KioskSetting.mod
+ $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
+ log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
+ if [ "$NONFREEMM" = "YES" ]
+ then
+ log_and_do_command_progress_pause "sudo isomorph --add mini
+ $MNT_POINT/mmorphix/morphed/MorphixMini-NonFree-FlashPlugin.mod
+ $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
+ log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
+ log_and_do_command_progress_pause "sudo isomorph --add mini
+ $MNT_POINT/mmorphix/morphed/MorphixMini-NonFree-Java.mod
+ $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
+ log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
+ fi
+ log_and_do_command_progress_pause "sudo morphix-rebrand
+ $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH
+ /tmp/tmp.iso
+ $REBRAND_GRAPHIC"
+ log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
+ fi
+ main_menu
+}
+
+###########################################################
+# #
# SECTION 98 : ABOUT MORPHING-MORPHIX #
# #
###########################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-07-15 14:33:32
|
Revision: 2536
http://svn.sourceforge.net/morphix/?rev=2536&view=rev
Author: bmsleight
Date: 2007-07-15 07:33:27 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
Allow MiniModule to set homepage
Modified Paths:
--------------
trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/preferences/prefs.js
Modified: trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/preferences/prefs.js
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/preferences/prefs.js 2007-07-15 12:05:14 UTC (rev 2535)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/preferences/prefs.js 2007-07-15 14:33:27 UTC (rev 2536)
@@ -1,7 +1,7 @@
/* Webconverger.com
*/
-pref("browser.startup.homepage", "http://www.morphix.org");
+// pref("browser.startup.homepage", "http://www.morphix.org");
pref("accessibility.typeaheadfind.flashBar", 0);
pref("app.update.enabled", false);
pref("browser.download.dir", "/tmp");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-07-15 12:05:26
|
Revision: 2535
http://svn.sourceforge.net/morphix/?rev=2535&view=rev
Author: bmsleight
Date: 2007-07-15 05:05:14 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
svn new url
Modified Paths:
--------------
trunk/mmaker/utils/auto-testing/AutoTestingMini.xml
Modified: trunk/mmaker/utils/auto-testing/AutoTestingMini.xml
===================================================================
--- trunk/mmaker/utils/auto-testing/AutoTestingMini.xml 2007-07-14 22:31:25 UTC (rev 2534)
+++ trunk/mmaker/utils/auto-testing/AutoTestingMini.xml 2007-07-15 12:05:14 UTC (rev 2535)
@@ -8,7 +8,7 @@
<bootoption>ALL</bootoption> <!-- Only run the minimodule when this bootoption is used. Special case run ALL the time-->
<filelist> <!-- files to be added to minimod available as $1/morphix/files/ -->
<remote>
- <file>http://svn.sourceforge.net/viewcvs.cgi/*checkout*/morphix/trunk/mmaker/utils/auto-testing/cat_file.sh</file>
+ <file>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/mmaker/utils/auto-testing/cat_file.sh</file>
</remote>
</filelist>
<commandlist> <!-- Commands to be started from minimodule -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-07-14 22:31:29
|
Revision: 2534
http://svn.sourceforge.net/morphix/?rev=2534&view=rev
Author: bmsleight
Date: 2007-07-14 15:31:25 -0700 (Sat, 14 Jul 2007)
Log Message:
-----------
vncrec is much neater, frame capured every second - by tracking only the changes in frame buffer of vnc session, rather than whole screenshot. Hopefully HD will last longer.
Modified Paths:
--------------
trunk/mmaker/utils/auto-testing/Required-Packages.txt
trunk/mmaker/utils/auto-testing/auto_testing.sh
trunk/mmaker/utils/auto-testing/run_testing.sh
Modified: trunk/mmaker/utils/auto-testing/Required-Packages.txt
===================================================================
--- trunk/mmaker/utils/auto-testing/Required-Packages.txt 2007-07-12 21:11:58 UTC (rev 2533)
+++ trunk/mmaker/utils/auto-testing/Required-Packages.txt 2007-07-14 22:31:25 UTC (rev 2534)
@@ -12,6 +12,8 @@
build-essential
debhelper
+vncrec - from source
+
Desired=Unknown/Install/Remove/Purge/Hold
| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed
|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)
Modified: trunk/mmaker/utils/auto-testing/auto_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/auto_testing.sh 2007-07-12 21:11:58 UTC (rev 2533)
+++ trunk/mmaker/utils/auto-testing/auto_testing.sh 2007-07-14 22:31:25 UTC (rev 2534)
@@ -42,35 +42,14 @@
isomorph --add boot "splash=n debugmorphix=yes" $ISO $TMP_D/qemu.iso
qemu -vnc :1 -no-kqemu -full-screen -pidfile $TMP_D/qemu.pid -cdrom $TMP_D/qemu.iso &
sleep 2
-vncviewer -encodings raw -fullscreen -viewonly 127.0.0.1:1 &
-#vncviewer -fullscreen -viewonly 127.0.0.1:1 &
+VNCREC_MOVIE_FRAMERATE=1
+export VNCREC_MOVIE_FRAMERATE
+vncrec -geometry 800x600 -record /tmp/qemu.1.vnc :1 &
+sleep 10
+killall vncrec
+vncrec -fullscreen -record /tmp/qemu.2.vnc :1 &
+sleep $FRAMES
-l=16
-#xwininfo -root | grep wininfo | cut -d' ' -f 4 >$TMP_D/xwid
-#rootwindow=$(cat $TMP_D/xwid)
-while [ $l -lt $FRAMES ]
-do
- if [ "$l" -lt "10" ]
- then
- convert=$DUMPS'00'$l'.miff'
- elif [ "$l" -lt "100" ]
- then
- convert=$DUMPS'0'$l'.miff'
- if [ "$l" -eq "22" ]
- then
- echo "hi"
- killall vncviewer
- vncviewer -encodings raw -fullscreen -viewonly 127.0.0.1:1 &
- fi
- else
- convert=$DUMPS$l'.miff'
- fi
- import -display :0 -window root $convert
-# sleep 0.5
- l=$(expr $l + 1)
- echo "Frame " $convert " at " $(date +"%F_%H:%M:%S.%N")
-done
-
kill_pid=$(cat $TMP_D/qemu.pid)
kill $kill_pid
rm $TMP_D/qemu.iso
@@ -82,32 +61,53 @@
# Hey - it also looks pretty :)
convert $MINILOGO -resize 200x200 -negate -gravity South -background Black -font Helvetica-Bold -fill white -splice 0x36 -pointsize 35 -draw "text 0,0 'AutoTesting'" -transparent black $TMP_D/minilogo.gif
convert $TMP_D/minilogo.gif -fill grey50 -colorize 40 $TMP_D/minilogo.gif
+
+VNCREC_MOVIE_CMD="convert xpm:- /tmp/dump/image-%05d.png"
+export VNCREC_MOVIE_CMD
+vncrec -movie /tmp/qemu.1.vnc
l=16
-while [ $l -lt $FRAMES ]
+for i in $(ls /tmp/dump/image-*.png);
do
- if [ "$l" -lt "10" ]
- then
- convert=$DUMPS'00'$l'.miff'
- elif [ "$l" -lt "100" ]
- then
- convert=$DUMPS'0'$l'.miff'
- else
- convert=$DUMPS$l'.miff'
- fi
-
- echo "Converting $convert -> $convert.jpg"
-# convert $convert -resize 800x600 $convert.jpg
-#
- convert $convert -resize 800x600 $convert.jpg
+ if [ "$l" -lt "10" ]
+ then
+ convert=$DUMPS'00'$l'.miff'
+ elif [ "$l" -lt "100" ]
+ then
+ convert=$DUMPS'0'$l'.miff'
+ else
+ convert=$DUMPS$l'.miff'
+ fi
+ let l=l+1
+ echo $i "->" $convert
+ convert $i -resize 800x600 $convert.jpg
composite -dissolve 15 -gravity northeast $TMP_D/minilogo.gif $convert.jpg $convert.jpg
- rm $convert
- l=$(expr $l + 1)
done
+rm /tmp/dump/image-*
+vncrec -movie /tmp/qemu.2.vnc 1>/dev/null
+for i in $(ls /tmp/dump/image-*.png);
+do
+ if [ "$l" -lt "10" ]
+ then
+ convert=$DUMPS'00'$l'.miff'
+ elif [ "$l" -lt "100" ]
+ then
+ convert=$DUMPS'0'$l'.miff'
+ else
+ convert=$DUMPS$l'.miff'
+ fi
+ let l=l+1
+ echo $i "->" $convert
+ convert $i -resize 800x600 $convert.jpg
+ composite -dissolve 15 -gravity northeast $TMP_D/minilogo.gif $convert.jpg $convert.jpg
+done
+rm /tmp/dump/image-*
+
+
# Create the intro to the video
title="Autotesting using Qemu"
text=" $ISO - The iso has been amended to help debugging. The boot-options splash=n debugmorphix=y have been added and a MiniModule Morphix-Mini-Debug-Auto-Testing.mod added. This MiniModule prints out debug information to the screen, the iso does not normally contain this MiniModule or display this information. \n $LIST_ISOMORPH \n \n $COMMENTS"
-FOLD_TEXT==$(echo "$text" | fold -s -w 100 )
+FOLD_TEXT=$(echo "$text" | fold -s -w 100 )
convert -size 600x440 xc:white -pointsize 25 -fill darkblue -annotate 0x0+250+75 "$title" -pointsize 10 -fill blue -annotate 0x0+50+200 "$FOLD_TEXT" -append $LOGO -bordercolor darkblue -border 20x20 -flatten "$DUMPS"0.jpg
convert "$DUMPS"0.jpg -resize 800x600 "$DUMPS"1.jpg
mv "$DUMPS"1.jpg "$DUMPS"0.jpg
@@ -131,3 +131,5 @@
ffmpeg2theora $VIDEO --artist "AutoTesting" --title "$VIDEO $COMMENTS" --organization "www.morphix.org" --copyright "copyleft" --date "$TODAY"
rm $VIDEO
rm $TMP_D -r
+rm /tmp/qemu.2.vnc
+rm /tmp/qemu.1.vnc
Modified: trunk/mmaker/utils/auto-testing/run_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/run_testing.sh 2007-07-12 21:11:58 UTC (rev 2533)
+++ trunk/mmaker/utils/auto-testing/run_testing.sh 2007-07-14 22:31:25 UTC (rev 2534)
@@ -174,7 +174,7 @@
echo $DIVIDER
sudo isomorph --list $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN
echo $DIVIDER
- sudo /home/morph/morphix/trunk/mmaker/utils/auto-testing/auto_testing.sh $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.avi 700
+ sudo /home/morph/morphix/trunk/mmaker/utils/auto-testing/auto_testing.sh $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.avi 800
sudo rm $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN
echo $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN
gzip -c $LOG_FILE >$VID_DIR/$LOG_FILE_BN'_'$TODAY'_.gz'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2007-07-12 21:12:22
|
Revision: 2533
http://svn.sourceforge.net/morphix/?rev=2533&view=rev
Author: alextreme
Date: 2007-07-12 14:11:58 -0700 (Thu, 12 Jul 2007)
Log Message:
-----------
* added a few new keycodes
Modified Paths:
--------------
trunk/keybconf/debian/changelog
trunk/keybconf/lists/qwertz
Modified: trunk/keybconf/debian/changelog
===================================================================
--- trunk/keybconf/debian/changelog 2007-07-03 22:08:46 UTC (rev 2532)
+++ trunk/keybconf/debian/changelog 2007-07-12 21:11:58 UTC (rev 2533)
@@ -1,3 +1,9 @@
+keybconf (0.3-4) unstable; urgency=low
+
+ * added Croatian/Slovenian/Bosnian keycodes (Thanatermesis)
+
+ -- <al...@al...> Thu, 12 Jul 2007 23:07:55 +0200
+
keybconf (0.3-3) unstable; urgency=low
* fixed Turkish setting (Thanatermesis)
Modified: trunk/keybconf/lists/qwertz
===================================================================
--- trunk/keybconf/lists/qwertz 2007-07-03 22:08:46 UTC (rev 2532)
+++ trunk/keybconf/lists/qwertz 2007-07-12 21:11:58 UTC (rev 2533)
@@ -1,3 +1,5 @@
+Bosnian - ba
+Croatian - hr
Czech - cz
German - de
Hungarian - hu
@@ -3,4 +5,5 @@
Serbian - sr
Slovak - sk
+Slovenian - si
Swiss (French) - ch
Swiss (German) - ch
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-07-03 22:08:47
|
Revision: 2532
http://svn.sourceforge.net/morphix/?rev=2532&view=rev
Author: bmsleight
Date: 2007-07-03 15:08:46 -0700 (Tue, 03 Jul 2007)
Log Message:
-----------
Adding a MiniModule template for add Java from debian-non-free
Added Paths:
-----------
trunk/scripts-mini/MorphixMini-NonFree-Java.xml
Added: trunk/scripts-mini/MorphixMini-NonFree-Java.xml
===================================================================
--- trunk/scripts-mini/MorphixMini-NonFree-Java.xml (rev 0)
+++ trunk/scripts-mini/MorphixMini-NonFree-Java.xml 2007-07-03 22:08:46 UTC (rev 2532)
@@ -0,0 +1,35 @@
+<!-- A minimodule quite long winded - as we have to download the Non-GPL software and the package in /root so that filesystem can be overlaid. -->
+<!-- Not ideal - but thats the problem with non-GPL software.-->
+<comps>
+ <group>
+ <minimod>
+ <version>0.04</version>
+ <description>MorphMini for loading sun-java5_1.5.0-10-3 non-GPL</description>
+ <minitag>Java</minitag>
+ <maintag>ALL</maintag>
+ <commandlist>
+ <preX>
+ <command>mkdir -p /usr/share/man/man1/ </command>
+ <command>sh $1/morphix/files/sun-java5-jre/postinst configure </command>
+ <command>sh $1/morphix/files/sun-java5-bin/postinst configure </command>
+ <command>sh $1/morphix/files/sun-java5-plugin/postinst configure </command>
+ </preX>
+ </commandlist>
+ <other>
+ <buildcommand>wget --output-document=$1/morphix/files/sun-java5-jre_1.5.0-10-3_all.deb http://ftp.uk.debian.org/debian/pool/non-free/s/sun-java5/sun-java5-jre_1.5.0-10-3_all.deb</buildcommand>
+ <buildcommand>mkdir $1/morphix/files/sun-java5-jre/</buildcommand>
+ <buildcommand>dpkg-deb -X $1/morphix/files/sun-java5-jre_1.5.0-10-3_all.deb $1/root/ </buildcommand>
+ <buildcommand>dpkg-deb -e $1/morphix/files/sun-java5-jre_1.5.0-10-3_all.deb $1/morphix/files/sun-java5-jre/ </buildcommand>
+ <buildcommand>wget --output-document=$1/morphix/files/sun-java5-bin_1.5.0-10-3_i386.deb http://ftp.uk.debian.org/debian/pool/non-free/s/sun-java5/sun-java5-bin_1.5.0-10-3_i386.deb</buildcommand>
+ <buildcommand>mkdir $1/morphix/files/sun-java5-bin/</buildcommand>
+ <buildcommand>dpkg-deb -X $1/morphix/files/sun-java5-bin_1.5.0-10-3_i386.deb $1/root/ </buildcommand>
+ <buildcommand>dpkg-deb -e $1/morphix/files/sun-java5-bin_1.5.0-10-3_i386.deb $1/morphix/files/sun-java5-bin/ </buildcommand>
+ <buildcommand>wget --output-document=$1/morphix/files/sun-java5-plugin_1.5.0-10-3_i386.deb http://ftp.uk.debian.org/debian/pool/non-free/s/sun-java5/sun-java5-plugin_1.5.0-10-3_i386.deb</buildcommand>
+ <buildcommand>mkdir $1/morphix/files/sun-java5-plugin/</buildcommand>
+ <buildcommand>dpkg-deb -X $1/morphix/files/sun-java5-plugin_1.5.0-10-3_i386.deb $1/root/ </buildcommand>
+ <buildcommand>dpkg-deb -e $1/morphix/files/sun-java5-plugin_1.5.0-10-3_i386.deb $1/morphix/files/sun-java5-plugin/ </buildcommand>
+ </other>
+ </minimod>
+ </group>
+</comps>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-06-28 22:20:23
|
Revision: 2531
http://svn.sourceforge.net/morphix/?rev=2531&view=rev
Author: bmsleight
Date: 2007-06-28 15:20:17 -0700 (Thu, 28 Jun 2007)
Log Message:
-----------
Adding a script to test Webconverger ISOs
Added Paths:
-----------
trunk/mmaker/utils/auto-testing/auto_testing.webconverger.sh
Added: trunk/mmaker/utils/auto-testing/auto_testing.webconverger.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/auto_testing.webconverger.sh (rev 0)
+++ trunk/mmaker/utils/auto-testing/auto_testing.webconverger.sh 2007-06-28 22:20:17 UTC (rev 2531)
@@ -0,0 +1,128 @@
+#!/bin/bash
+#
+# Copyleft (c) 2006 Brendan M. Sleight #
+# <bmsleight@barwap._REMOVE_SPAM_TRAP.com> #
+# #
+# This script is licensed under the GNU GPL v2 or later. #
+# #
+# On Debian systems, this license can be obtained via #
+# /usr/share/common-licenses/GPL #
+#
+LOGO=/home/morph/images/webconverger.jpg
+MINILOGO=/home/morph/images/webconverger.jpg
+TODAY=$(date +"%F")
+ISO=$1
+VIDEO=$2
+COMMENTS=$4
+if [ -z "$ISO" -a -z "$VIDEO" ]; then
+ echo "Usage: $0 ISO output.avi [Num capture frames] [comments]"
+ echo
+ echo "e.g. $0 Morphing-Morphix.iso Morphing-Morphix.avi "
+ echo "e.g. $0 Morphing-Morphix.iso Morphing-Morphix.avi 800 "
+ echo "e.g. $0 Morphing-Morphix.iso Morphing-Morphix.avi 1000 \"D/load on 2006-01-01\" "
+ echo
+ echo "This script tests a Webconverger ISO using qemu "
+ echo " and then generates a video"
+ echo
+ exit
+fi
+
+if [ -z "$3" ]; then
+ FRAMES=480
+ else
+ FRAMES=$(expr $3 + 16)
+fi
+
+TMP_D=/tmp/dump/
+DUMPS=$TMP_D/dump
+mkdir $TMP_D 2>/dev/null
+
+qemu -vnc :1 -no-kqemu -full-screen -pidfile $TMP_D/qemu.pid -cdrom $ISO &
+sleep 2
+vncviewer -encodings raw -fullscreen -viewonly 127.0.0.1:1 &
+l=16
+while [ $l -lt $FRAMES ]
+do
+ if [ "$l" -lt "10" ]
+ then
+ convert=$DUMPS'00'$l'.miff'
+ elif [ "$l" -lt "100" ]
+ then
+ convert=$DUMPS'0'$l'.miff'
+ if [ "$l" -eq "22" ]
+ then
+ # vncviewer does not like the jump from grub resolution to 800x600
+ # so we (very ugly) start a new vncview.
+ killall vncviewer
+ vncviewer -encodings raw -fullscreen -viewonly 127.0.0.1:1 &
+ fi
+ else
+ convert=$DUMPS$l'.miff'
+ fi
+ import -display :0 -window root $convert
+# sleep 0.5
+ l=$(expr $l + 1)
+ echo "Frame " $convert " at " $(date +"%F_%H:%M:%S.%N")
+done
+
+kill_pid=$(cat $TMP_D/qemu.pid)
+kill $kill_pid
+rm $TMP_D/qemu.pid
+
+# Make minilog for top corner.
+# This ensures that there is no completely back jpg with no info
+# as mencode seg faults if a jpg is completly empty
+# Hey - it also looks pretty :)
+convert $MINILOGO -resize 200x200 -negate -gravity South -background Black -font Helvetica-Bold -fill white -splice 0x36 -pointsize 35 -draw "text 0,0 'AutoTesting'" -transparent black $TMP_D/minilogo.gif
+convert $TMP_D/minilogo.gif -fill grey50 -colorize 40 $TMP_D/minilogo.gif
+l=16
+while [ $l -lt $FRAMES ]
+do
+ if [ "$l" -lt "10" ]
+ then
+ convert=$DUMPS'00'$l'.miff'
+ elif [ "$l" -lt "100" ]
+ then
+ convert=$DUMPS'0'$l'.miff'
+ else
+ convert=$DUMPS$l'.miff'
+ fi
+
+ echo "Converting $convert -> $convert.jpg"
+# convert $convert -resize 800x600 $convert.jpg
+#
+ convert $convert -resize 800x600 $convert.jpg
+ composite -dissolve 15 -gravity northeast $TMP_D/minilogo.gif $convert.jpg $convert.jpg
+ rm $convert
+ l=$(expr $l + 1)
+done
+
+# Create the intro to the video
+title="Autotesting using Qemu"
+text=" $ISO - General Comments \n \n $COMMENTS"
+FOLD_TEXT=$(echo "$text" | fold -s -w 100 )
+convert $LOGO -resize 200 /tmp/logo.jpg
+convert -size 600x440 xc:white -pointsize 25 -fill darkblue -annotate 0x0+250+75 "$title" -pointsize 10 -fill blue -annotate 0x0+50+200 "$FOLD_TEXT" -append /tmp/logo.jpg -bordercolor darkblue -border 20x20 -flatten "$DUMPS"0.jpg
+convert "$DUMPS"0.jpg -resize 800x600 "$DUMPS"1.jpg
+mv "$DUMPS"1.jpg "$DUMPS"0.jpg
+l=1
+while [ $l -lt 16 ]
+do
+ if [ "$l" -lt "10" ]
+ then
+ convert=$DUMPS'00'$l'.miff.jpg'
+ elif [ "$l" -lt "100" ]
+ then
+ convert=$DUMPS'0'$l'.miff.jpg'
+ else
+ convert=$DUMPS$l'.miff.jpg'
+ fi
+ composite -dissolve 15 -gravity northeast $TMP_D/minilogo.gif "$DUMPS"0.jpg $convert
+ l=$(expr $l + 1)
+done
+
+mencoder mf://$TMP_D*.jpg -mf w=800:h=600:fps=4:type=jpg -ovc lavc -lavcopts vcodec=mpeg4:mbd=2:trell -oac copy -o $VIDEO
+ffmpeg2theora $VIDEO --artist "AutoTesting" --title "$VIDEO $COMMENTS" --organization "www.morphix.org" --copyright "copyleft" --date "$TODAY"
+rm $VIDEO
+rm $TMP_D -r
+rm /tmp/logo.jpg
Property changes on: trunk/mmaker/utils/auto-testing/auto_testing.webconverger.sh
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-06-25 12:56:24
|
Revision: 2530
http://svn.sourceforge.net/morphix/?rev=2530&view=rev
Author: bmsleight
Date: 2007-06-25 05:56:21 -0700 (Mon, 25 Jun 2007)
Log Message:
-----------
New NonFree-FlashPlugin template
Modified Paths:
--------------
trunk/mmaker/utils/auto-testing/run_testing.sh
trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
Added Paths:
-----------
trunk/morphixlivekiosk/templates/MorphixMini-NonFree-FlashPlugin.xml
trunk/scripts-mini/MorphixMini-NonFree-FlashPlugin.xml
Modified: trunk/mmaker/utils/auto-testing/run_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/run_testing.sh 2007-06-24 20:58:57 UTC (rev 2529)
+++ trunk/mmaker/utils/auto-testing/run_testing.sh 2007-06-25 12:56:21 UTC (rev 2530)
@@ -63,48 +63,48 @@
find /home/morph/videos/ -not -type d -mtime +4 -print0 | xargs --null --no-run-if-empty sudo rm -f
find /home/morph/autobuilds/video/ -not -type d -mtime +4 -print0 | xargs --null --no-run-if-empty sudo rm -f
-
-if [ -z "$SKIP_DOWNLOADS" ]; then
+if [ "$SKIP_DOWNLOADS" != "SkipAll" ]; then
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/base/*$TODAY* /home/morph/autobuilds/base/
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sid/*$TODAY* /home/morph/autobuilds/mainmod/sid/
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/etch/*$TODAY* /home/morph/autobuilds/mainmod/etch/
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sarge/*$TODAY* /home/morph/autobuilds/mainmod/sarge/
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/minimod/*$TODAY* /home/morph/autobuilds/minimod/
- #Get Autobuilds from alextreme.org
- echo $DIVIDER
- echo "Getting AutoBuilds from Alextreme.org"
- echo $TITLED
- date
-
- STORE_AT_MM="/home/morph/alextreme/mainmod"
- REMOTE_AT_MM="http://www.alextreme.org/autobuilds/"
- GNOME_NAME="morphix-gnome-"
- KDE_NAME="morphix-kde-"
-
- find $STORE_AT_MM/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
- rm $STORE_AT_MM/index.html* 1>/dev/null 2>&1
- wget_cl() {
- wget --no-verbose --tries=3 --timeout=60 --directory-prefix=$1 $2
- }
- wget_cl "$STORE_AT_MM" "$REMOTE_AT_MM/"
- if [ -e $STORE_AT_MM/index.html ]
- then
- TODAY=$(date +"%F")
- GNOME=$( grep $STORE_AT_MM/index.html -e $GNOME_NAME$TODAY | sed -e s/^.*\<a\ href=\"//g | sed -e s/\"\>.*$//g | grep -e "mod$")
- KDE=$( grep $STORE_AT_MM/index.html -e $KDE_NAME$TODAY | sed -e s/^.*\<a\ href=\"//g | sed -e s/\"\>.*$//g | grep -e "mod$")
- WGETS=" $REMOTE_AT_MM/$GNOME $REMOTE_AT_MM/$GNOME.md5 $REMOTE_AT_MM/$KDE $REMOTE_AT_MM/$KDE.md5"
- for WGET in $WGETS
- do
- if [ -e $WGET ]
+ if [ "$SKIP_DOWNLOADS" != "SkipAlextreme" ]; then
+ #Get Autobuilds from alextreme.org
+ echo $DIVIDER
+ echo "Getting AutoBuilds from Alextreme.org"
+ echo $TITLED
+ date
+ STORE_AT_MM="/home/morph/alextreme/mainmod"
+ REMOTE_AT_MM="http://www.alextreme.org/autobuilds/"
+ GNOME_NAME="morphix-gnome-"
+ KDE_NAME="morphix-kde-"
+
+ find $STORE_AT_MM/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
+ rm $STORE_AT_MM/index.html* 1>/dev/null 2>&1
+ wget_cl() {
+ wget --no-verbose --tries=3 --timeout=60 --directory-prefix=$1 $2
+ }
+ wget_cl "$STORE_AT_MM" "$REMOTE_AT_MM/"
+ if [ -e $STORE_AT_MM/index.html ]
then
- echo $WGET ' file exists skipping d/load'
- else
- wget_cl $STORE_AT_MM $WGET
- fi
- done
- else
- echo "$REMOTE_AT_MM/index.html does not exist skipping other d/loads"
+ TODAY=$(date +"%F")
+ GNOME=$( grep $STORE_AT_MM/index.html -e $GNOME_NAME$TODAY | sed -e s/^.*\<a\ href=\"//g | sed -e s/\"\>.*$//g | grep -e "mod$")
+ KDE=$( grep $STORE_AT_MM/index.html -e $KDE_NAME$TODAY | sed -e s/^.*\<a\ href=\"//g | sed -e s/\"\>.*$//g | grep -e "mod$")
+ WGETS=" $REMOTE_AT_MM/$GNOME $REMOTE_AT_MM/$GNOME.md5 $REMOTE_AT_MM/$KDE $REMOTE_AT_MM/$KDE.md5"
+ for WGET in $WGETS
+ do
+ if [ -e $WGET ]
+ then
+ echo $WGET ' file exists skipping d/load'
+ else
+ wget_cl $STORE_AT_MM $WGET
+ fi
+ done
+ else
+ echo "$REMOTE_AT_MM/index.html does not exist skipping other d/loads"
+ fi
fi
fi
Modified: trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
===================================================================
--- trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh 2007-06-24 20:58:57 UTC (rev 2529)
+++ trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh 2007-06-25 12:56:21 UTC (rev 2530)
@@ -237,16 +237,16 @@
MESSAGE_MAIN_MENU_3="Using isomorph to get a clean base"
MESSAGE_MAIN_MENU_4="Submenu [MiniModules]"
MESSAGE_MAIN_MENU_5="Submenu [MainModules]"
-MESSAGE_MAIN_MENU_6="Rebranding an Morphix LiveCD"
+MESSAGE_MAIN_MENU_6="Rebranding a Morphix LiveCD"
MESSAGE_MAIN_MENU_7="Building MorphixLiveKiosk from Scratch"
MESSAGE_MAIN_MENU_8="Open a terminal for Morphing"
-MESSAGE_MAIN_MENU_9="Testing an LiveCD using qemu"
+MESSAGE_MAIN_MENU_9="Testing a LiveCD using qemu"
MESSAGE_MAIN_MENU_RETURN="Return to Main Menu"
MESSAGE_CONFIGURE_MENU="$MESSAGE_MAIN_MENU_1"
MESSAGE_CONFIGURE_MENU_1="Configure MorphingMorphix"
MESSAGE_CONFIGURE_MENU_2="Remove old CD Images then complete Configuration"
MESSAGE_MINIMODS_MENU="$MESSAGE_MAIN_MENU_4"
-MESSAGE_MINIMODS_MENU_1="Using an XML template to build a MiniModule"
+MESSAGE_MINIMODS_MENU_1="Using a XML template to build a MiniModule"
MESSAGE_MINIMODS_MENU_2="Saving the Home Directory to a MiniModule "
MESSAGE_MAINMODS_MENU="$MESSAGE_MAIN_MENU_5"
MESSAGE_MAINMODS_MENU_1="Using an XML template to build a mainmodule"
Added: trunk/morphixlivekiosk/templates/MorphixMini-NonFree-FlashPlugin.xml
===================================================================
--- trunk/morphixlivekiosk/templates/MorphixMini-NonFree-FlashPlugin.xml (rev 0)
+++ trunk/morphixlivekiosk/templates/MorphixMini-NonFree-FlashPlugin.xml 2007-06-25 12:56:21 UTC (rev 2530)
@@ -0,0 +1 @@
+link ../../scripts-mini/MorphixMini-NonFree-FlashPlugin.xml
\ No newline at end of file
Property changes on: trunk/morphixlivekiosk/templates/MorphixMini-NonFree-FlashPlugin.xml
___________________________________________________________________
Name: svn:special
+ *
Added: trunk/scripts-mini/MorphixMini-NonFree-FlashPlugin.xml
===================================================================
--- trunk/scripts-mini/MorphixMini-NonFree-FlashPlugin.xml (rev 0)
+++ trunk/scripts-mini/MorphixMini-NonFree-FlashPlugin.xml 2007-06-25 12:56:21 UTC (rev 2530)
@@ -0,0 +1,25 @@
+<!-- A minimodule quite long winded - as we have to download the Non-GPL software and the package in /root so that filesystem can be overlaid. -->
+<!-- Not ideal - but thats the problem with non-GPL software.-->
+<comps>
+ <group>
+ <minimod>
+ <version>0.04</version>
+ <description>MorphMini for loading flash_player_9 non-GPL</description>
+ <minitag>Flash</minitag>
+ <maintag>ALL</maintag>
+ <!-- <bootoption>nonfree=yes</bootoption> --> <!-- Requires morphing-tools 0.2-20 + -->
+ <commandlist> <!-- Commands to be started from minimodule -->
+ <preX> <!-- Commands to run before X windows start -->
+ <command>ln -s /usr/local/install_flash_player_9_linux/libflashplayer.so /usr/lib/iceweasel/plugins/libflashplayer.so </command>
+ <command>ln -s /usr/local/install_flash_player_9_linux/flashplayer.xpt /usr/lib/iceweasel/plugins/flashplayer.xpt </command>
+ </preX>
+ </commandlist>
+ <other> <!-- used to make a minimodule in another way - command will be passed $1 for minimodule filesystem -->
+ <buildcommand>mkdir -p $1/root/usr/bin $1/root/usr/local/ $1/root/usr/lib/iceweasel/plugins/ </buildcommand>
+ <buildcommand>wget --output-document=$1/morphix/files/install_flash_player_9_linux.tar.gz http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz </buildcommand>
+ <buildcommand>tar zxvf $1/morphix/files/install_flash_player_9_linux.tar.gz -C $1/root/usr/local/ </buildcommand>
+ </other>
+ </minimod>
+ </group>
+</comps>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-06-24 20:59:00
|
Revision: 2529
http://svn.sourceforge.net/morphix/?rev=2529&view=rev
Author: bmsleight
Date: 2007-06-24 13:58:57 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
Pulled it apart and included only the bare essentials.
Modified Paths:
--------------
trunk/mmaker/templates/morphix-livekiosk.xml
Modified: trunk/mmaker/templates/morphix-livekiosk.xml
===================================================================
--- trunk/mmaker/templates/morphix-livekiosk.xml 2007-06-24 19:50:57 UTC (rev 2528)
+++ trunk/mmaker/templates/morphix-livekiosk.xml 2007-06-24 20:58:57 UTC (rev 2529)
@@ -1,72 +1,53 @@
<comps>
<group>
- <version>0.1</version>
+ <version>0.04</version>
<id>MorphixLiveKiosk</id>
<name>Morphix LiveKiosk</name>
<repositorylist>
<repository type="debian">ftp://ftp.debian.org/debian</repository>
<repository type="plain" suite="unstable">http://www.morphix.org/debian</repository>
- <repository type="debian" suite="etch/updates">http://ftp.debian.org/debian/debian-security/</repository>
</repositorylist>
<description>Morphix Live Kiosk mainmodule. Outline template, LiveCD will have a single application running full screen</description>
<type>mainmod</type>
<suite>etch</suite>
<packagelist>
-
-<packagereq>alsa-base</packagereq>
-<packagereq>alsa-utils</packagereq>
-<packagereq>bzip2</packagereq>
-<packagereq>dhcp-client</packagereq>
-<packagereq>dialog</packagereq>
-<packagereq>evince</packagereq>
-<packagereq>grub</packagereq>
-<packagereq>hotplug</packagereq>
-<packagereq>less</packagereq>
-<packagereq>linux-wlan-ng</packagereq>
-<packagereq>locales</packagereq>
-<packagereq>menu</packagereq>
-<packagereq>menu-xdg</packagereq>
-<packagereq>module-init-tools</packagereq> <!-- necessary for kernels 2.5+ -->
-<packagereq>mozplugger</packagereq>
-<packagereq>pcmcia-cs</packagereq>
-<packagereq>perl-modules</packagereq>
-<packagereq>pump</packagereq>
-<packagereq>sudo</packagereq>
-<packagereq>unzip</packagereq>
-<packagereq>wireless-tools</packagereq>
-<packagereq>xloadimage</packagereq> <!-- necessary for xsetbg at boot -->
-<packagereq>xbase-clients</packagereq>
-<packagereq>xscreensaver</packagereq>
-<packagereq>xutils</packagereq>
-<packagereq>console-data</packagereq>
-<packagereq>console-common</packagereq>
-
-<!-- from morphix.org -->
-<packagereq>xserver-xorg</packagereq> <!--Include whilst problem upstream in sid with this depends-->
-<packagereq>xorg</packagereq> <!--Include whilst problem upstream in sid with this depends-->
-<packagereq>morphix-init-matchbox</packagereq> <!-- which depends matchbox -->
-<packagereq>morphix-background</packagereq>
-
-<!-- The single application which will be running -->
-<!-- This requires MorphixMini-PersistentApp.xml to add to ~/.persistent-app to launch application -->
-<packagereq>iceweasel</packagereq>
-<packagereq>iceweasel-l10n-*</packagereq>
-<packagereq>iceweasel-webconverger-morphixlivekiosk</packagereq>
-<!-- These alternatives do not work well yet - hence comment out -->
-<!-- <packagereq>gcjwebplugin</packagereq> -->
-<!-- <packagereq>kaffe</packagereq> -->
-<!-- Used for testing/debuging version -->
-<!-- <packagereq>openssh-server</packagereq> -->
-</packagelist>
-
-<!-- The single application does not neet documentation, manuals or other consoles -->
- <commandlist>
- <command>rm -rf /usr/share/doc</command>
- <command>rm -rf /usr/share/man</command>
- <command>rm -rf /usr/share/man-db</command>
- <command>rm -f /morphix/rc.m/S03console</command>
- <command>rm -f /morphix/init.d/console</command>
- </commandlist>
-
-</group>
+ <packagereq>alsa-base</packagereq>
+ <packagereq>alsa-utils</packagereq>
+ <packagereq>console-data</packagereq>
+ <packagereq>dhcp-client</packagereq>
+ <packagereq>dialog</packagereq>
+ <packagereq>hotplug</packagereq>
+ <packagereq>linux-wlan-ng</packagereq>
+ <packagereq>locales</packagereq>
+ <packagereq>module-init-tools</packagereq> <!-- necessary for kernels 2.5+ -->
+ <packagereq>pcmcia-cs</packagereq>
+ <packagereq>wireless-tools</packagereq>
+ <packagereq>xorg</packagereq>
+ <packagereq>xloadimage</packagereq> <!-- necessary for xsetbg at boot -->
+ <!-- from morphix.org -->
+ <packagereq>morphix-init-matchbox</packagereq> <!-- which depends matchbox -->
+ <packagereq>morphix-background</packagereq>
+ <!-- The single application which will be running -->
+ <!-- This requires MorphixMini-PersistentApp.xml to add to ~/.persistent-app to launch application -->
+ <packagereq>iceweasel</packagereq>
+ <packagereq>iceweasel-l10n-*</packagereq>
+ <packagereq>iceweasel-webconverger-morphixlivekiosk</packagereq>
+ <packagereq>xscreensaver</packagereq>
+ <packagereq>mozplugger</packagereq>
+ <!-- These alternatives do not work well yet - hence comment out -->
+ <!-- <packagereq>gcjwebplugin</packagereq> -->
+ <!-- <packagereq>kaffe</packagereq> -->
+ <!-- Used for testing/debuging version -->
+ <!-- <packagereq>openssh-server</packagereq> -->
+ <!-- <packagereq>sudo</packagereq> -->
+ </packagelist>
+ <!-- The single application does not neet documentation, manuals or other consoles -->
+ <commandlist>
+ <command>rm -rf /usr/share/doc</command>
+ <command>rm -rf /usr/share/man</command>
+ <command>rm -rf /usr/share/man-db</command>
+ <command>rm -f /morphix/rc.m/S03console</command>
+ <command>rm -f /morphix/init.d/console</command>
+ </commandlist>
+ </group>
</comps>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-06-24 19:50:59
|
Revision: 2528
http://svn.sourceforge.net/morphix/?rev=2528&view=rev
Author: bmsleight
Date: 2007-06-24 12:50:57 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
Adding links to screenshots - (html dump)
Modified Paths:
--------------
trunk/how_tos/docbook_html/ar01s02.html
trunk/how_tos/docbook_html/ar01s03.html
trunk/how_tos/docbook_html/ar01s04.html
trunk/how_tos/docbook_html/ar01s05.html
trunk/how_tos/docbook_html/ar01s06.html
trunk/how_tos/docbook_html/ar01s07.html
trunk/how_tos/docbook_html/ar01s08.html
trunk/how_tos/docbook_html/ar01s09.html
trunk/how_tos/docbook_html/bi01.html
trunk/how_tos/docbook_html/go01.html
trunk/how_tos/docbook_html/index.html
trunk/how_tos/docbook_html/ix01.html
Modified: trunk/how_tos/docbook_html/ar01s02.html
===================================================================
--- trunk/how_tos/docbook_html/ar01s02.html 2007-06-24 19:50:31 UTC (rev 2527)
+++ trunk/how_tos/docbook_html/ar01s02.html 2007-06-24 19:50:57 UTC (rev 2528)
@@ -1,11 +1,11 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>Preface</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="index.html" title="Morphix Manual"><link rel="next" href="ar01s03.html" title="Morphix ISO README"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Preface</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s03.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2509790"></a>Preface</h2></div></div></div><p>This is an attempt to document some of ways to use Morphix. In particular to support a new Morphix LiveCD - MorphingMorphix.</p><p><a class="indexterm" name="id2509803"></a>
-The following is an extract from Knoppix Hacks - 100 Industrial-Strength Tips and Tools describing Morphix.</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2509814"></a>A look at Morphix: The Hack-friendly Live CD</h3></div></div></div><p>Given the popularity of Knoppix and the vast amount of people
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Preface</title><meta name="generator" content="DocBook XSL Stylesheets V1.72.0"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="index.html" title="Morphix Manual"><link rel="next" href="ar01s03.html" title="Morphix ISO README"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Preface</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s03.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2542599"></a>Preface</h2></div></div></div><p>This is an attempt to document some of ways to use Morphix. In particular to support a new Morphix LiveCD - MorphingMorphix.</p><p><a class="indexterm" name="id2542611"></a>
+The following is an extract from Knoppix Hacks - 100 Industrial-Strength Tips and Tools describing Morphix.</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2542623"></a>A look at Morphix: The Hack-friendly Live CD</h3></div></div></div><p>Given the popularity of Knoppix and the vast amount of people
working on derivative versions of Knoppix, it doesn't come as a
surprise that people have been working to make Knoppix easier to
modify and more flexible to use. In early 2003, Morphix was born out
of a number of Knoppix remasters' wishes to have a version of Knoppix
that was good at what they used Knoppix for: a base upon which to
-build their own versions using Debian GNU/Linux.</p><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2471567"></a>What makes Morphix so special compared to other Live CDs</h4></div></div></div><p>As you have seen in this book, there are a number of ways to change Knoppix to
+build their own versions using Debian GNU/Linux.</p><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2542642"></a>What makes Morphix so special compared to other Live CDs</h4></div></div></div><p>As you have seen in this book, there are a number of ways to change Knoppix to
your liking. However, these possibilities have always been, and probably always
will be, fairly limited. Knoppix was made for different goals: to detect your
hardware as fast and correct as possible, to be a good demonstration of Linux
@@ -36,24 +36,24 @@
them. All combined ISOs contain the Morphix installer, a graphical
tool for installing Morphix onto your harddisk, and a number of
other graphical and command line Morphix tools for various
-purposes. Each of these live CDs has their own targeted audience—our
+purposes. Each of these live CDs has their own targeted audience—our
opinion has always been that we should offer (limited) choice to users
-and as much choice as possible for developers:</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2471384"></a>Morphix LightGUI</h4></div></div></div><p>Aimed at lower-end PCs, LightGUI features the XFCE4 desktop and
+and as much choice as possible for developers:</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2504205"></a>Morphix LightGUI</h4></div></div></div><p>Aimed at lower-end PCs, LightGUI features the XFCE4 desktop and
contains a reasonable amount of lighter tools. It was the initial
version of Morphix, and the aim has been to keep LightGUI small enough to
have it fit on 210MB CDR(W). LightGUI includes Abiword, Gnumeric, Dillo and
Firefox. For communication, Gaim and Xchat are included, and for
-photo processing the GIMP has been added.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2471406"></a>Morphix Gnome</h4></div></div></div><p>Formerly named Morphix HeavyGUI, this flavour was for some time the
+photo processing the GIMP has been added.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2504227"></a>Morphix Gnome</h4></div></div></div><p>Formerly named Morphix HeavyGUI, this flavour was for some time the
only conterpart of LightGUI. Including Gnome, OpenOffice.org,
Mozilla, and the kitchen sink, Morphix Gnome was aimed at office users
with more recent machines. Even so, a normal Morphix Gnome ISO still
doesn't fill up the whole (650MB) CD-ROM, and recent versions weigh in at
-around 500MB.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2471427"></a>Morphix KDE</h4></div></div></div><p>Although primarily focused on GTK/Gnome, the Morphix crew acknowledges
+around 500MB.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2504248"></a>Morphix KDE</h4></div></div></div><p>Although primarily focused on GTK/Gnome, the Morphix crew acknowledges
that users might prefer KDE instead (and looking at the number of
derivatives, a lot of users do!). Morphix KDE contains the whole KDE suite of
programs, as well as Mozilla and other applications. Morphix KDE
sits inbetween LightGUI and Gnome when it comes to size, and fills up
-approximately 400MB of space on your CD-ROM.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2471449"></a>Morphix Game</h4></div></div></div><p>An odd-ball in Morphix, this flavour contains the very light IceWM and
+approximately 400MB of space on your CD-ROM.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2504270"></a>Morphix Game</h4></div></div></div><p>An odd-ball in Morphix, this flavour contains the very light IceWM and
a very large number of Open Source games. BZflag, Frozen Bubble, Freecraft
and many, many others are sure to entertain the kids (or entertain the
kid in you) for quite a few hours. Normally Morphix Game also includes
@@ -67,7 +67,7 @@
that derivatives can even rebrand the Morphix installer, although the
source itself is licensed under the GNU GPL. A graphical partitioner
and series of configuration tools have been under development and are
-likely to be part of Morphix by the time this book comes off the press.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2471486"></a>Morphing-Morphix</h4></div></div></div><p>The purpose of <span class="emphasis"><em>Morphing-Morphix</em></span> is to provide the quick way to start <span class="emphasis"><em>Morphing</em></span> and making your own LiveCD. Just boot the CD and start Morphing, no need to install tools, compile applications or switch operating systems. All is required is some space on a connected hard drive. The aim is to be able make new Morphix LiveCDs using this LiveCD, as an introduction to Morphix. In fact this LiveCD was made using Morphing-Morphix.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2471510"></a>Derivatives</h4></div></div></div><p>A lot has been said about the number of Linux distributions recently. What
+likely to be part of Morphix by the time this book comes off the press.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2504307"></a>Morphing-Morphix</h4></div></div></div><p>The purpose of <span class="emphasis"><em>Morphing-Morphix</em></span> is to provide the quick way to start <span class="emphasis"><em>Morphing</em></span> and making your own LiveCD. Just boot the CD and start Morphing, no need to install tools, compile applications or switch operating systems. All is required is some space on a connected hard drive. The aim is to be able make new Morphix LiveCDs using this LiveCD, as an introduction to Morphix. In fact this LiveCD was made using Morphing-Morphix.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2504332"></a>Derivatives</h4></div></div></div><p>A lot has been said about the number of Linux distributions recently. What
others see as a complicated mess, we see as a healthy, messy
eco-system. Morphix has quite a few offspring
and a lot of them are specially focussed at a single group of people
@@ -78,4 +78,4 @@
liking take a look on www.morphix.org for a list of related
projects. Even if you start 'morphing' from one of these derivatives,
you can be sure of a base to fall back to and a design that will get
-your project 'live' and updated ASAP.</p><p>Happy Morphing!</p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Morphix Manual </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Morphix ISO README</td></tr></table></div></body></html>
+your project 'live' and updated ASAP.</p><p>Happy Morphing!</p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Morphix Manual </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Morphix ISO README</td></tr></table></div></body></html>
Modified: trunk/how_tos/docbook_html/ar01s03.html
===================================================================
--- trunk/how_tos/docbook_html/ar01s03.html 2007-06-24 19:50:31 UTC (rev 2527)
+++ trunk/how_tos/docbook_html/ar01s03.html 2007-06-24 19:50:57 UTC (rev 2528)
@@ -1,37 +1,37 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>Morphix ISO README</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="ar01s02.html" title="Preface"><link rel="next" href="ar01s04.html" title="Fast Introduction to building your own Morphix based livecd"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Morphix ISO README</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s02.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s04.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2471551"></a>Morphix ISO README</h2></div></div></div><p>If you're wondering what the directories on the cdrom do, this is the right
-document. If not, take a look on morphix.org! (don't miss the FAQ or wiki)</p><p><a class="indexterm" name="id2471635"></a>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Morphix ISO README</title><meta name="generator" content="DocBook XSL Stylesheets V1.72.0"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="ar01s02.html" title="Preface"><link rel="next" href="ar01s04.html" title="Fast Introduction to building your own Morphix based livecd"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Morphix ISO README</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s02.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s04.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2504373"></a>Morphix ISO README</h2></div></div></div><p>If you're wondering what the directories on the cdrom do, this is the right
+document. If not, take a look on morphix.org! (don't miss the FAQ or wiki)</p><p><a class="indexterm" name="id2504438"></a>
<span class="emphasis"><em>o /boot</em></span>
- contains the init ramdisk, grub menu and kernel</p><p><a class="indexterm" name="id2471651"></a>
+ contains the init ramdisk, grub menu and kernel</p><p><a class="indexterm" name="id2504454"></a>
<span class="emphasis"><em>o /base</em></span>
contains morphix, the module that detects/configures your hardware and
- contains your standard kernel modules.</p><p><a class="indexterm" name="id2471668"></a>
+ contains your standard kernel modules.</p><p><a class="indexterm" name="id2504470"></a>
<span class="emphasis"><em>o /mainmod</em></span>
contains mainmodules, these are also cloop images, comparable to
the /base/morphix file, but using a different structure
see README.mainmod for info about the internal structure of these files
In short: mainmodules contain your filesystem, except for your kernel,
- loadable kernel modules, and hardware detection scripts.</p><p><a class="indexterm" name="id2471694"></a>
+ loadable kernel modules, and hardware detection scripts.</p><p><a class="indexterm" name="id2504496"></a>
<span class="emphasis"><em>o /minimod </em></span>
contains minimodules, again these are cloop images.
You don't need them, but you can add extra functionality by including
- extra minimodules. See README.minimod.</p><p><a class="indexterm" name="id2471714"></a>
-<span class="emphasis"><em>o /exec </em></span>
+ extra minimodules. See README.minimod.</p><p><a class="indexterm" name="id2504516"></a>
+<span class="emphasis"><em>o /exec </em></span> <code class="literal">
If you place files in this directory, they will be executed at
boottime. Note that this does not mean that programs using X
will be executed, the proper way would be to add a line to .xinitrc
- for this. Place the following in /exec/script.sh for example:
+ for this. Place the following in /exec/script.sh for example: </code>
<span class="emphasis"><em>echo \"program\" >> /home/morph/.xinitrc</em></span>
<span class="emphasis"><em>echo \"program\" >> /home/morph/.xsession</em></span>
(Does Debian still use .xsession? not 100% sure, xinitrc should
- be enough…)
+ be enough…)
Again, try this out. Exit from X, execute the script, and
- 'sh /morphix/init.sh'</p><p><a class="indexterm" name="id2471759"></a>
-<span class="emphasis"><em>o /copy</em></span>
+ 'sh /morphix/init.sh'</p><p><a class="indexterm" name="id2504566"></a>
+<span class="emphasis"><em>o /copy</em></span> <code class="literal">
If you place files in this directory, they will be copied over to the
root of your filesystem. Use directories to place files in a certain
- directory instead. For example, have:
+ directory instead. For example, have: </code>
<span class="emphasis"><em>/copy/home/morph/.xfce4/xfcerc</em></span>
to copy the xfcerc file to /home/morph/.xfce4/xfcerc at boottime.</p><pre class="literallayout">Interesting things can be done with adding files to locations like: +
'/copy/morphix/init.sh'
or
- '/copy/morphix/loadmod.sh'</pre><pre class="literallayout">as these files are executed after being swapped. Great fun ;)</pre></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s02.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s04.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Preface </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Fast Introduction to building your own Morphix based livecd</td></tr></table></div></body></html>
+ '/copy/morphix/loadmod.sh'</pre><pre class="literallayout">as these files are executed after being swapped. Great fun ;)</pre></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s02.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s04.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Preface </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Fast Introduction to building your own Morphix based livecd</td></tr></table></div></body></html>
Modified: trunk/how_tos/docbook_html/ar01s04.html
===================================================================
--- trunk/how_tos/docbook_html/ar01s04.html 2007-06-24 19:50:31 UTC (rev 2527)
+++ trunk/how_tos/docbook_html/ar01s04.html 2007-06-24 19:50:57 UTC (rev 2528)
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>Fast Introduction to building your own Morphix based livecd</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="ar01s03.html" title="Morphix ISO README"><link rel="next" href="ar01s05.html" title="HowTo: Building a new LiveCD in two commands"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Fast Introduction to building your own Morphix based livecd</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s03.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s05.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2471803"></a>Fast Introduction to building your own Morphix based livecd</h2></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2471810"></a>Really Fast Introduction</h3></div></div></div><div class="itemizedlist"><ul type="disc"><li>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Fast Introduction to building your own Morphix based livecd</title><meta name="generator" content="DocBook XSL Stylesheets V1.72.0"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="ar01s03.html" title="Morphix ISO README"><link rel="next" href="ar01s05.html" title="HowTo: Building a new LiveCD in two commands"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Fast Introduction to building your own Morphix based livecd</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s03.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s05.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2504616"></a>Fast Introduction to building your own Morphix based livecd</h2></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2504622"></a>Really Fast Introduction</h3></div></div></div><div class="itemizedlist"><ul type="disc"><li>
Get a Morphix Base iso
</li><li>
Add "deb http://www.morphix.org/debian ./" to your /etc/apt/source.list
@@ -10,7 +10,7 @@
mmaker mymainmod.xml myprograms.mod
</li><li>
make-iso /path/source myfirstlivecd.iso
-</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2471866"></a>Fast Introduction</h3></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2471872"></a>Foreplay</h4></div></div></div><div class="itemizedlist"><ul type="disc"><li>
+</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2504679"></a>Fast Introduction</h3></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2504685"></a>Foreplay</h4></div></div></div><div class="itemizedlist"><ul type="disc"><li>
Use a Debian based Linux distro [preferably Debian sid, aka unstable, but every recent one should do]
</li><li>
Get a morphix based .iso [or better: just a base .iso, preferably a stable one atm, like 0.5-pre5 or an autobuilded base .iso]
@@ -20,17 +20,17 @@
mount -t iso9660 -o loop nameoftheisoyoudownloaded.iso /mnt/whatever
</li><li>
cp -a /mnt/whatever/* /path/to/the/extracted/stuff [like /scratch/iso]
-</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2472177"></a>Setting up the build environment</h4></div></div></div><div class="itemizedlist"><ul type="disc"><li>
+</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2505009"></a>Setting up the build environment</h4></div></div></div><div class="itemizedlist"><ul type="disc"><li>
Add "deb http://www.morphix.org/debian ./" to your /etc/apt/source.list
</li><li>
apt-get update
</li><li>
apt-get install morphing-tools
-</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2472210"></a>Creating your own mainmodule</h4></div></div></div><div class="itemizedlist"><ul type="disc"><li>
+</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2505042"></a>Creating your own mainmodule</h4></div></div></div><div class="itemizedlist"><ul type="disc"><li>
See this manual about mmaker for building an .xml file describing your mainmodule, which will basically be your system
</li><li>
If you're done with the .xml file [e.g., mymainmod.xml], type "mmaker mymainmod.xml myprograms.mod" or whatever you like to name them
-</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2472241"></a>Building an .iso out of it</h4></div></div></div><div class="itemizedlist"><ul type="disc"><li>
+</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2505073"></a>Building an .iso out of it</h4></div></div></div><div class="itemizedlist"><ul type="disc"><li>
Now, remove the files in /scratch/iso/mainmod
</li><li>
Copy/move your myprograms.mod into /scratch/iso/mainmod
@@ -38,4 +38,4 @@
make-iso /scratch/iso myfirstlivecd.iso
</li><li>
Done. Burn to cd with your favorite burn program or run with "qemu -cdrom myfirstlivecd.iso" in the qemu emulator, for example
-</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2472286"></a>More advanced stuff</h4></div></div></div><p>If you manually modify some stuff in /tmp/libmorphix-<randomsequence> (e.g., /tmp/libmorphix-9oVKWq) , you have to use the following command to recompress the mainmod: "module-builder /tmp/libmorphix-9oVKWq aquamorph_20051120a.mod" (or whatever you want to call the mainmodule).</p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s03.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s05.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Morphix ISO README </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> HowTo: Building a new LiveCD in two commands</td></tr></table></div></body></html>
+</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2505119"></a>More advanced stuff</h4></div></div></div><p>If you manually modify some stuff in /tmp/libmorphix-<randomsequence> (e.g., /tmp/libmorphix-9oVKWq) , you have to use the following command to recompress the mainmod: "module-builder /tmp/libmorphix-9oVKWq aquamorph_20051120a.mod" (or whatever you want to call the mainmodule).</p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s03.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s05.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Morphix ISO README </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> HowTo: Building a new LiveCD in two commands</td></tr></table></div></body></html>
Modified: trunk/how_tos/docbook_html/ar01s05.html
===================================================================
--- trunk/how_tos/docbook_html/ar01s05.html 2007-06-24 19:50:31 UTC (rev 2527)
+++ trunk/how_tos/docbook_html/ar01s05.html 2007-06-24 19:50:57 UTC (rev 2528)
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>HowTo: Building a new LiveCD in two commands</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="ar01s04.html" title="Fast Introduction to building your own Morphix based livecd"><link rel="next" href="ar01s06.html" title="Morphix tools"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">HowTo: Building a new LiveCD in two commands</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s04.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s06.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2472309"></a>HowTo: Building a new LiveCD in two commands</h2></div></div></div><p><a class="indexterm" name="id2472317"></a>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>HowTo: Building a new LiveCD in two commands</title><meta name="generator" content="DocBook XSL Stylesheets V1.72.0"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="ar01s04.html" title="Fast Introduction to building your own Morphix based livecd"><link rel="next" href="ar01s06.html" title="Morphix tools"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">HowTo: Building a new LiveCD in two commands</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s04.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s06.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2505142"></a>HowTo: Building a new LiveCD in two commands</h2></div></div></div><p><a class="indexterm" name="id2505149"></a>
<a name="BuildingLiveCDtwocommands"></a></p><div class="itemizedlist"><ul type="disc"><li>
<a href="ar01s05.html#SettingUptheBuildEnvironment" title="Setting up the build environment">Setting Up the Build Environment</a>
</li><li>
@@ -23,8 +23,8 @@
<repository type="debian">http://127.0.0.1/sid/</repository></pre><p>With the lines</p><pre class="literallayout"><repository type="debian">ftp://ftp.debian.org/debian</repository>
<!-- <repository type="debian">http://127.0.0.1/sid/</repository> --></pre></div><div class="itemizedlist"><ul type="disc"><li>
<a href="http://www.morphix.org/doc/how_tos/images/MorphixLiveKiosk.png" target="_top">Graphics file used for Rebranding</a>
-</li></ul></div><div class="example"><a name="id2519321"></a><p class="title"><b>Example 1. Graphics File used for Rebranding</b></p><p><span class="inlinemediaobject"><img src="../images/MorphixLiveKiosk.png" width="500" alt="Rebranded Boot Splash Background"></span></p></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="IsoMakerExmaple"></a>Two Commands</h3></div></div></div><p>Run isomaker then morphix-rebrand (The magic two commands)</p><div class="itemizedlist"><ul type="disc"><li>
+</li></ul></div><div class="example"><a name="id2552150"></a><p class="title"><b>Example 1. Graphics File used for Rebranding</b></p><div class="example-contents"><p><span class="inlinemediaobject"><img src="../images/MorphixLiveKiosk.png" width="500" alt="Rebranded Boot Splash Background"></span></p></div></div><br class="example-break"></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="IsoMakerExmaple"></a>Two Commands</h3></div></div></div><p>Run isomaker then morphix-rebrand (The magic two commands)</p><div class="itemizedlist"><ul type="disc"><li>
isomaker -b ./basemod-2.6.15.xml -m ./morphix-livekiosk.xml -n ./MorphixMini-KioskSetting.xml -n ./MorphixMini-KioskAddins.xml -r http://www.morphix.org/debian -p grub-gfxboot-iso-udeb -p morphix-cdrom-misc-udeb -p morphix-grub-menulist-udeb -p morphix-iso-grubtheme ./morphix-livekiosk.iso
</li><li>
morphix-rebrand ./morphix-livekiosk.iso ./MorphixLiveKiosk.iso ./MorphixLiveKiosk.png
-</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="HowDoesItLook"></a>Volia One LiveCD</h3></div></div></div><p>Isomaker can take about 45 minutes to run. Morphix-rebrand about 2 minutes.</p><p>After this fun you should have a bootable LiveCD</p><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2519411"></a>Boot Menu</h4></div></div></div><p><span class="inlinemediaobject"><img src="../images/RebrandBootMenu.png" alt="Rebranded Grub Menu"></span></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2519435"></a>Boot-Up Screen</h4></div></div></div><p><span class="inlinemediaobject"><img src="../images/RebrandBootSplash.png" alt="Rebranded Boot Splash"></span></p><p>Or if you press F2</p><p><span class="inlinemediaobject"><img src="../images/RebrandBootUp.png" alt="Rebranded Boot Splash Backround"></span></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2519480"></a>X-Background / Wallpaper</h4></div></div></div><p>Should be the same as the Graphics file.</p><p><span class="inlinemediaobject"><img src="../images/MorphixLiveKiosk.png" alt="Rebranded Boot Splash Backround"></span></p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s04.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s06.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Fast Introduction to building your own Morphix based livecd </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Morphix tools</td></tr></table></div></body></html>
+</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="HowDoesItLook"></a>Volia One LiveCD</h3></div></div></div><p>Isomaker can take about 45 minutes to run. Morphix-rebrand about 2 minutes.</p><p>After this fun you should have a bootable LiveCD</p><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2552239"></a>Boot Menu</h4></div></div></div><p><span class="inlinemediaobject"><img src="../images/RebrandBootMenu.png" alt="Rebranded Grub Menu"></span></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2552263"></a>Boot-Up Screen</h4></div></div></div><p><span class="inlinemediaobject"><img src="../images/RebrandBootSplash.png" alt="Rebranded Boot Splash"></span></p><p>Or if you press F2</p><p><span class="inlinemediaobject"><img src="../images/RebrandBootUp.png" alt="Rebranded Boot Splash Backround"></span></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2552309"></a>X-Background / Wallpaper</h4></div></div></div><p>Should be the same as the Graphics file.</p><p><span class="inlinemediaobject"><img src="../images/MorphixLiveKiosk.png" alt="Rebranded Boot Splash Backround"></span></p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s04.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s06.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Fast Introduction to building your own Morphix based livecd </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Morphix tools</td></tr></table></div></body></html>
Modified: trunk/how_tos/docbook_html/ar01s06.html
===================================================================
--- trunk/how_tos/docbook_html/ar01s06.html 2007-06-24 19:50:31 UTC (rev 2527)
+++ trunk/how_tos/docbook_html/ar01s06.html 2007-06-24 19:50:57 UTC (rev 2528)
@@ -1,26 +1,26 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>Morphix tools</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="ar01s05.html" title="HowTo: Building a new LiveCD in two commands"><link rel="next" href="ar01s07.html" title="HowTo: Some Examples to help you start Morphing"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Morphix tools</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s05.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s07.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2519510"></a>Morphix tools</h2></div></div></div><p>A number of commandline tools and scripts are provided in order to help
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Morphix tools</title><meta name="generator" content="DocBook XSL Stylesheets V1.72.0"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="ar01s05.html" title="HowTo: Building a new LiveCD in two commands"><link rel="next" href="ar01s07.html" title="HowTo: Some Examples to help you start Morphing"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Morphix tools</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s05.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s07.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2552339"></a>Morphix tools</h2></div></div></div><p>A number of commandline tools and scripts are provided in order to help
you morph. You can find all of these in the Morphix repository,
-see <a href="http://www.morphix.org/debian" target="_top">http://www.morphix.org/debian</a> for details.</p><p><a class="indexterm" name="id2519532"></a>
+see <a href="http://www.morphix.org/debian" target="_top">http://www.morphix.org/debian</a> for details.</p><p><a class="indexterm" name="id2552360"></a>
<span class="emphasis"><em>- module-builder (morphix-modulebuilder)</em></span>
- Constructs a module from a directory</p><p><a class="indexterm" name="id2519548"></a>
+ Constructs a module from a directory</p><p><a class="indexterm" name="id2552377"></a>
<span class="emphasis"><em>- module-extractor (morphix-moduleextractor)</em></span>
- Extracts files from a module to a directory</p><p><a class="indexterm" name="id2519565"></a>
+ Extracts files from a module to a directory</p><p><a class="indexterm" name="id2552394"></a>
<span class="emphasis"><em>- make-iso (morphix-make-iso)</em></span>
- Creates a bootable ISO from a directory, detects multiple base versions.</p><p><a class="indexterm" name="id2519582"></a>
+ Creates a bootable ISO from a directory, detects multiple base versions.</p><p><a class="indexterm" name="id2552410"></a>
<span class="emphasis"><em>- isomorph (morphix-isomorph)</em></span>
- Lists modules on an ISO, adds or removes modules from an ISO, and more!</p><p><a class="indexterm" name="id2519598"></a>
+ Lists modules on an ISO, adds or removes modules from an ISO, and more!</p><p><a class="indexterm" name="id2552427"></a>
<span class="emphasis"><em>- mmaker (morphix-mmaker)</em></span>
Creates a base or main module, using template files. Examples are in /usr/share/mmaker/templates.
See <a href="http://www.morphix.org/wiki/index.php/ModuleMaker" target="_top">http://www.morphix.org/wiki/index.php/ModuleMaker</a>
-and documentation in /usr/share/doc/mmaker for details.</p><p><a class="indexterm" name="id2519626"></a>
+and documentation in /usr/share/doc/mmaker for details.</p><p><a class="indexterm" name="id2552454"></a>
<span class="emphasis"><em>- isomaker (morphix-mmaker)</em></span>
Creates an iso, using one or more mmaker template files.
- See documentation in /usr/share/doc/mmaker for details.</p><p><a class="indexterm" name="id2519645"></a>
+ See documentation in /usr/share/doc/mmaker for details.</p><p><a class="indexterm" name="id2552473"></a>
<span class="emphasis"><em>- make-mini (morphix-mmaker)</em></span>
Commandline tool for building homedir and language minimodules.</p><p><span class="emphasis"><em>- install2mainmod (morphix-install2mainmod)</em></span>
- Converts a running hdd install into a mainmodule.</p><p><a class="indexterm" name="id2519669"></a>
+ Converts a running hdd install into a mainmodule.</p><p><a class="indexterm" name="id2552497"></a>
<span class="emphasis"><em>- minimod-gen (morphix-minimodgen)</em></span>
Provides a commandline interface for building simple minimodules.</p><p><span class="emphasis"><em>- addtoiso (morphix-addtoiso)</em></span>
- Add file to an iso, without having to copy the file all within the image</p><p><a class="indexterm" name="id2519693"></a>
+ Add file to an iso, without having to copy the file all within the image</p><p><a class="indexterm" name="id2552522"></a>
<span class="emphasis"><em>- morphix-rebrand (morphix-rebrand)</em></span>
- This script Re-brands a Morphix CD image using a single graphics file.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s05.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s07.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">HowTo: Building a new LiveCD in two commands </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> HowTo: Some Examples to help you start Morphing</td></tr></table></div></body></html>
+ This script Re-brands a Morphix CD image using a single graphics file.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s05.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s07.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">HowTo: Building a new LiveCD in two commands </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> HowTo: Some Examples to help you start Morphing</td></tr></table></div></body></html>
Modified: trunk/how_tos/docbook_html/ar01s07.html
===================================================================
--- trunk/how_tos/docbook_html/ar01s07.html 2007-06-24 19:50:31 UTC (rev 2527)
+++ trunk/how_tos/docbook_html/ar01s07.html 2007-06-24 19:50:57 UTC (rev 2528)
@@ -1,5 +1,5 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>HowTo: Some Examples to help you start Morphing</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="ar01s06.html" title="Morphix tools"><link rel="next" href="ar01s08.html" title="Appendix FAQ: Frequently Asked Questions FAQ"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">HowTo: Some Examples to help you start Morphing</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s06.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s08.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2519710"></a>HowTo: Some Examples to help you start Morphing</h2></div></div></div><p><a class="indexterm" name="id2519717"></a>
-Some <span class="emphasis"><em>updated</em></span> How Tos to help you get started with Morphing. These HowTos are available on interacive <span class="emphasis"><em>How To</em></span> LiveCD called <span class="emphasis"><em>Morphing-Morphix</em></span>, much better than a boring document.</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2519741"></a>A look at MorphingMorphix 0.3</h3></div></div></div><p>The purpose of MorphingMorphix is to provide a quick way
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>HowTo: Some Examples to help you start Morphing</title><meta name="generator" content="DocBook XSL Stylesheets V1.72.0"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="ar01s06.html" title="Morphix tools"><link rel="next" href="ar01s08.html" title="Appendix FAQ: Frequently Asked Questions FAQ"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">HowTo: Some Examples to help you start Morphing</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s06.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s08.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2552538"></a>HowTo: Some Examples to help you start Morphing</h2></div></div></div><p><a class="indexterm" name="id2552546"></a>
+Some <span class="emphasis"><em>updated</em></span> How Tos to help you get started with Morphing. These HowTos are available on interacive <span class="emphasis"><em>How To</em></span> LiveCD called <span class="emphasis"><em>Morphing-Morphix</em></span>, much better than a boring document.</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2552570"></a>A look at MorphingMorphix 0.3</h3></div></div></div><p>The purpose of MorphingMorphix is to provide a quick way
to start Morphing and to showcase all the Morphix tools
- a LiveCD contruction kit. Just boot the CD and start
Morphing, no need to install tools, compile applications or
@@ -30,7 +30,7 @@
<a href="ar01s07.html#BuildingwholeISO" title="Building a whole ISO from Scratch">Building a whole ISO from Scratch</a>
</li><li>
<a href="ar01s07.html#TestQemu" title="Testing an iso using Qemu">Testing an iso using Qemu</a>
-</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="Introduction"></a>Introduction</h3></div></div></div><p>LiveCD are stored as .iso files. Which can then be written
+</li></ul></div><p><a href="http://www.morphix.org/doc/how_tos/images/MorphingMorphix/" target="_top">ScreenShots of MorphingMorphix running are shown on a separate page.</a> It shows the ease of use for MorphingMorphix.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="Introduction"></a>Introduction</h3></div></div></div><p>LiveCD are stored as .iso files. Which can then be written
to a CD. One of the morphing-tools is isomorph. This can be
used to manipulate morphix iso files.</p><p>Isomorph can list, add, del and get files on the Morphix
LiveCDs.</p><p>Isomorph is used in all of the other examples.</p><p>For example we will now run the command</p><pre class="literallayout">isomorph --list MyMorph.iso</pre></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="Remove"></a>Remove Modules</h3></div></div></div><p>We have now got our CD Image file, by copying this running
@@ -133,7 +133,7 @@
</li><li>
Edit configuration files
</li><li>
-Have fun ….
+Have fun ….
</li></ul></div><p>We will now extract the MainModule. This can take a while
as ~800M is extracted. We started then dropped in to the
MainModule root. Once we exit we re-compress the MainModule.</p><p>We will use the commands</p><pre class="literallayout">isomorph --get main ./MyMorph.iso /tmp/
@@ -160,4 +160,4 @@
achieves a good emulation speed by using dynamic
translation.</p><p>In short: Boot your LiveCD inside your current operating
system. A little slower but faster than burning a cd and
-rebooting. Good for testing.</p><pre class="literallayout">qemu -boot d -cdrom ./MyMorph.iso</pre></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s06.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s08.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Morphix tools </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Appendix FAQ: Frequently Asked Questions FAQ</td></tr></table></div></body></html>
+rebooting. Good for testing.</p><pre class="literallayout">qemu -boot d -cdrom ./MyMorph.iso</pre></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s06.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s08.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Morphix tools </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Appendix FAQ: Frequently Asked Questions FAQ</td></tr></table></div></body></html>
Modified: trunk/how_tos/docbook_html/ar01s08.html
===================================================================
--- trunk/how_tos/docbook_html/ar01s08.html 2007-06-24 19:50:31 UTC (rev 2527)
+++ trunk/how_tos/docbook_html/ar01s08.html 2007-06-24 19:50:57 UTC (rev 2528)
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>Appendix FAQ: Frequently Asked Questions FAQ</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="ar01s07.html" title="HowTo: Some Examples to help you start Morphing"><link rel="next" href="ar01s09.html" title="Appendix Transition"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix FAQ: Frequently Asked Questions FAQ</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s07.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s09.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2520623"></a>Appendix FAQ: Frequently Asked Questions FAQ</h2></div></div></div><p><a class="indexterm" name="id2520630"></a></p><div class="itemizedlist"><ul type="disc"><li>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Appendix FAQ: Frequently Asked Questions FAQ</title><meta name="generator" content="DocBook XSL Stylesheets V1.72.0"><link rel="start" href="index.html" title="Morphix Manual"><link rel="up" href="index.html" title="Morphix Manual"><link rel="prev" href="ar01s07.html" title="HowTo: Some Examples to help you start Morphing"><link rel="next" href="ar01s09.html" title="Appendix Transition"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix FAQ: Frequently Asked Questions FAQ</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s07.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s09.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2553462"></a>Appendix FAQ: Frequently Asked Questions FAQ</h2></div></div></div><p><a class="indexterm" name="id2553469"></a></p><div class="itemizedlist"><ul type="disc"><li>
<a href="ar01s08.html#AboutMorphix" title="About Morphix">About Morphix</a>
</li><li>
<a href="ar01s08.html#BootingMorphix" title="Booting Morphix">Booting Morphix</a>
@@ -6,7 +6,7 @@
<a href="ar01s08.html#UsingMorphix" title="Using Morphix">Using Morphix</a>
</li><li>
<a href="ar01s08.html#InstallingMorphix" title="Installing Morphix">Installing Morphix</a>
-</li></ul></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="AboutMorphix"></a>About Morphix</h3></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2520710"></a>What is Morphix ?</h4></div></div></div><p>Morphix is a GNU/Linux operating system on a CD.</p><p>In other words, you don't have to install anything to your harddisk…simply drop in the cd, boot your pc, use Morphix! When you reboot (without the cd in the drive) your machine will be the way you had it before…completely unchanged.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2520734"></a>What is Morphix used for ?</h4></div></div></div><div class="itemizedlist"><ul type="disc"><li>
+</li></ul></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="AboutMorphix"></a>About Morphix</h3></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2553549"></a>What is Morphix ?</h4></div></div></div><p>Morphix is a GNU/Linux operating system on a CD.</p><p>In other words, you don't have to install anything to your harddisk…simply drop in the cd, boot your pc, use Morphix! When you reboot (without the cd in the drive) your machine will be the way you had it before…completely unchanged.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2553574"></a>What is Morphix used for ?</h4></div></div></div><div class="itemizedlist"><ul type="disc"><li>
A whole operating system, to install your programs on and give out. Why send out installation disks, give them a whole operating system with your files.
</li><li>
A rescue disk. A working operating system to boot your fscked looking hardware.
@@ -14,7 +14,7 @@
A Linux demo CD, spread the word, by showing people a Linux operating system.
</li><li>
Dust-off old hardware, with defunct harddrives and rejuvenate them.
-</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2520783"></a>What is Morphix made out of ?</h4></div></div></div><p>Morphix is a derivative of Knoppix, another live CD distribution. Both are based heavly on Debian.</p><p>Morphix is modular; this means that it consists of a number of parts which together form a working distribution. What does this mean to a normal user?</p><p>Well, that's the good part: he/she doesn't even know about the modules. The modularity is invisible to the user, save the startup-output on the console (which is hidden via a progress-screen in the latest releases). So, if you don't care about how it works, just grab one of the combined isos and boot it! The best thing is that these isos can be easily modified (Morphed) by you as you require.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2520812"></a>Why Morphix? Why should I care?</h4></div></div></div><div class="itemizedlist"><ul type="disc"><li>
+</li></ul></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2553623"></a>What is Morphix made out of ?</h4></div></div></div><p>Morphix is a derivative of Knoppix, another live CD distribution. Both are based heavly on Debian.</p><p>Morphix is modular; this means that it consists of a number of parts which together form a working distribution. What does this mean t...
[truncated message content] |
|
From: <bms...@us...> - 2007-06-24 19:50:37
|
Revision: 2527
http://svn.sourceforge.net/morphix/?rev=2527&view=rev
Author: bmsleight
Date: 2007-06-24 12:50:31 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
Adding links to screenshots
Modified Paths:
--------------
trunk/how_tos/morphix_docbook.txt
trunk/how_tos/morphix_docbook.xml
Modified: trunk/how_tos/morphix_docbook.txt
===================================================================
--- trunk/how_tos/morphix_docbook.txt 2007-06-24 14:37:29 UTC (rev 2526)
+++ trunk/how_tos/morphix_docbook.txt 2007-06-24 19:50:31 UTC (rev 2527)
@@ -450,6 +450,8 @@
* <<BuildingwholeISO, Building a whole ISO from Scratch>>
* <<TestQemu, Testing an iso using Qemu>>
+http://www.morphix.org/doc/how_tos/images/MorphingMorphix/[ScreenShots of MorphingMorphix running are shown on a separate page.] It shows the ease of use for MorphingMorphix.
+
[[Introduction]]
Introduction
Modified: trunk/how_tos/morphix_docbook.xml
===================================================================
--- trunk/how_tos/morphix_docbook.xml 2007-06-24 14:37:29 UTC (rev 2526)
+++ trunk/how_tos/morphix_docbook.xml 2007-06-24 19:50:31 UTC (rev 2527)
@@ -200,11 +200,11 @@
<simpara><indexterm>
<primary>exec</primary>
</indexterm>
-<emphasis>o /exec </emphasis>
+<emphasis>o /exec </emphasis> <literal>
If you place files in this directory, they will be executed at
boottime. Note that this does not mean that programs using X
will be executed, the proper way would be to add a line to .xinitrc
- for this. Place the following in /exec/script.sh for example:
+ for this. Place the following in /exec/script.sh for example: </literal>
<emphasis>echo \"program\" >> /home/morph/.xinitrc</emphasis>
<emphasis>echo \"program\" >> /home/morph/.xsession</emphasis>
(Does Debian still use .xsession? not 100% sure, xinitrc should
@@ -215,10 +215,10 @@
<simpara><indexterm>
<primary>copy</primary>
</indexterm>
-<emphasis>o /copy</emphasis>
+<emphasis>o /copy</emphasis> <literal>
If you place files in this directory, they will be copied over to the
root of your filesystem. Use directories to place files in a certain
- directory instead. For example, have:
+ directory instead. For example, have: </literal>
<emphasis>/copy/home/morph/.xfce4/xfcerc</emphasis>
to copy the xfcerc file to /home/morph/.xfce4/xfcerc at boottime.</simpara>
@@ -678,6 +678,8 @@
</simpara>
</listitem>
</itemizedlist>
+<simpara><ulink url="http://www.morphix.org/doc/how_tos/images/MorphingMorphix/">ScreenShots of MorphingMorphix running are shown on a separate page.</ulink> It shows the ease of use for MorphingMorphix.</simpara>
+
</section>
<section id="Introduction">
<title>Introduction</title>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-06-24 14:37:33
|
Revision: 2526
http://svn.sourceforge.net/morphix/?rev=2526&view=rev
Author: bmsleight
Date: 2007-06-24 07:37:29 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
Adding MorphingMorphix ScreenShots
Added Paths:
-----------
trunk/how_tos/images/MorphingMorphix/
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-01--Boot-Menu.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-02--Booting-Up-Graphic.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-03--Booting-Up-Text-01.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-04--Booting-Up-Text-02.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-05--Booting-Up-Text-03.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-06--Finished-Booting.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-07--Menu-Option-1-Configure-Morphing-Morphix.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-08--Menu-Option-1-Configure-Morphing-Morphix-Setting-Up.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-09--Menu-Option-2-Intro-isomorph.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-10--Menu-Option-2-Intro-isomorph-Output.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-11--Menu-Option-3-Remove-Modules.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-12--Menu-Option-3-Remove-Modules-Output.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-13--Menu-Option-3-Remove-Modules-Output_2.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-14--Menu-Option-4-SubMenu-MiniModues.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-15--Menu-Option-4-SubMenu-MiniModues-XML-Template.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-16--Menu-Option-5-SubMenu-MainModules.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-17--Menu-Option-8-Open-A-Terminal.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-18--Menu-Option-9-Tesing-using-Qemu.png
trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-19--Menu-Option-9-Tesing-using-Qemu-Output.png
trunk/how_tos/images/MorphingMorphix/index.html
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-01--Boot-Menu.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-01--Boot-Menu.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-02--Booting-Up-Graphic.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-02--Booting-Up-Graphic.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-03--Booting-Up-Text-01.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-03--Booting-Up-Text-01.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-04--Booting-Up-Text-02.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-04--Booting-Up-Text-02.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-05--Booting-Up-Text-03.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-05--Booting-Up-Text-03.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-06--Finished-Booting.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-06--Finished-Booting.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-07--Menu-Option-1-Configure-Morphing-Morphix.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-07--Menu-Option-1-Configure-Morphing-Morphix.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-08--Menu-Option-1-Configure-Morphing-Morphix-Setting-Up.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-08--Menu-Option-1-Configure-Morphing-Morphix-Setting-Up.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-09--Menu-Option-2-Intro-isomorph.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-09--Menu-Option-2-Intro-isomorph.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-10--Menu-Option-2-Intro-isomorph-Output.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-10--Menu-Option-2-Intro-isomorph-Output.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-11--Menu-Option-3-Remove-Modules.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-11--Menu-Option-3-Remove-Modules.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-12--Menu-Option-3-Remove-Modules-Output.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-12--Menu-Option-3-Remove-Modules-Output.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-13--Menu-Option-3-Remove-Modules-Output_2.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-13--Menu-Option-3-Remove-Modules-Output_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-14--Menu-Option-4-SubMenu-MiniModues.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-14--Menu-Option-4-SubMenu-MiniModues.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-15--Menu-Option-4-SubMenu-MiniModues-XML-Template.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-15--Menu-Option-4-SubMenu-MiniModues-XML-Template.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-16--Menu-Option-5-SubMenu-MainModules.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-16--Menu-Option-5-SubMenu-MainModules.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-17--Menu-Option-8-Open-A-Terminal.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-17--Menu-Option-8-Open-A-Terminal.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-18--Menu-Option-9-Tesing-using-Qemu.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-18--Menu-Option-9-Tesing-using-Qemu.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-19--Menu-Option-9-Tesing-using-Qemu-Output.png
===================================================================
(Binary files differ)
Property changes on: trunk/how_tos/images/MorphingMorphix/MorphingMorphix-v003--ScreenShot-19--Menu-Option-9-Tesing-using-Qemu-Output.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/how_tos/images/MorphingMorphix/index.html
===================================================================
--- trunk/how_tos/images/MorphingMorphix/index.html (rev 0)
+++ trunk/how_tos/images/MorphingMorphix/index.html 2007-06-24 14:37:29 UTC (rev 2526)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="iso-8859-1"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta name="description" content="Morphix - the modular GNU/Linux LiveCD distribution" />
+<meta name="keywords" content="morphix,linux,livecd,morphing,modules" />
+<meta name="robots" content="index, follow" />
+ <link rel="shortcut icon" href="http://www.morphix.org/images/favicon.ico" />
+ <link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="http://www.morphix.org/favicon.ico" />
+</head>
+<body>
+<html>
+<img src=MorphingMorphix-v003--ScreenShot-01--Boot-Menu.png><br />MorphingMorphix-v003--ScreenShot-01--Boot-Menu.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-02--Booting-Up-Graphic.png><br />MorphingMorphix-v003--ScreenShot-02--Booting-Up-Graphic.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-03--Booting-Up-Text-01.png><br />MorphingMorphix-v003--ScreenShot-03--Booting-Up-Text-01.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-04--Booting-Up-Text-02.png><br />MorphingMorphix-v003--ScreenShot-04--Booting-Up-Text-02.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-05--Booting-Up-Text-03.png><br />MorphingMorphix-v003--ScreenShot-05--Booting-Up-Text-03.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-06--Finished-Booting.png><br />MorphingMorphix-v003--ScreenShot-06--Finished-Booting.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-07--Menu-Option-1-Configure-Morphing-Morphix.png><br />MorphingMorphix-v003--ScreenShot-07--Menu-Option-1-Configure-Morphing-Morphix.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-08--Menu-Option-1-Configure-Morphing-Morphix-Setting-Up.png><br />MorphingMorphix-v003--ScreenShot-08--Menu-Option-1-Configure-Morphing-Morphix-Setting-Up.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-09--Menu-Option-2-Intro-isomorph.png><br />MorphingMorphix-v003--ScreenShot-09--Menu-Option-2-Intro-isomorph.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-10--Menu-Option-2-Intro-isomorph-Output.png><br />MorphingMorphix-v003--ScreenShot-10--Menu-Option-2-Intro-isomorph-Output.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-11--Menu-Option-3-Remove-Modules.png><br />MorphingMorphix-v003--ScreenShot-11--Menu-Option-3-Remove-Modules.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-12--Menu-Option-3-Remove-Modules-Output.png><br />MorphingMorphix-v003--ScreenShot-12--Menu-Option-3-Remove-Modules-Output.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-13--Menu-Option-3-Remove-Modules-Output_2.png><br />MorphingMorphix-v003--ScreenShot-13--Menu-Option-3-Remove-Modules-Output_2.png<br />
+<p>
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-14--Menu-Option-4-SubMenu-MiniModues.png><br />MorphingMorphix-v003--ScreenShot-14--Menu-Option-4-SubMenu-MiniModues.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-15--Menu-Option-4-SubMenu-MiniModues-XML-Template.png><br />MorphingMorphix-v003--ScreenShot-15--Menu-Option-4-SubMenu-MiniModues-XML-Template.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-16--Menu-Option-5-SubMenu-MainModules.png><br />MorphingMorphix-v003--ScreenShot-16--Menu-Option-5-SubMenu-MainModules.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-17--Menu-Option-8-Open-A-Terminal.png><br />MorphingMorphix-v003--ScreenShot-17--Menu-Option-8-Open-A-Terminal.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-18--Menu-Option-9-Tesing-using-Qemu.png><br />MorphingMorphix-v003--ScreenShot-18--Menu-Option-9-Tesing-using-Qemu.png<br />
+<p>
+<img src=MorphingMorphix-v003--ScreenShot-19--Menu-Option-9-Tesing-using-Qemu-Output.png><br />MorphingMorphix-v003--ScreenShot-19--Menu-Option-9-Tesing-using-Qemu-Output.png<br />
+<p>
+</body>
+</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-06-23 07:59:41
|
Revision: 2525
http://svn.sourceforge.net/morphix/?rev=2525&view=rev
Author: bmsleight
Date: 2007-06-23 00:59:36 -0700 (Sat, 23 Jun 2007)
Log Message:
-----------
Update to MorphixLiveKiosk Template - using etch, preparing for a long-term support release of MLK-Building Templates, ready for a new MorphingMorphix. Adding a quick list of the packages needed to run a AutoTesting machine, (Might be worth building an V/Qemu Image at some point). To Do: Expand on AutoTesting vnc session, so that x-session is not required - look at vncrec
Modified Paths:
--------------
trunk/mmaker/templates/morphix-livekiosk.xml
Added Paths:
-----------
trunk/mmaker/utils/auto-testing/Required-Packages.txt
Modified: trunk/mmaker/templates/morphix-livekiosk.xml
===================================================================
--- trunk/mmaker/templates/morphix-livekiosk.xml 2007-06-21 22:11:39 UTC (rev 2524)
+++ trunk/mmaker/templates/morphix-livekiosk.xml 2007-06-23 07:59:36 UTC (rev 2525)
@@ -1,20 +1,18 @@
<comps>
<group>
- <version>0.5</version>
- <id>firefox</id>
+ <version>0.1</version>
+ <id>MorphixLiveKiosk</id>
<name>Morphix LiveKiosk</name>
<repositorylist>
<repository type="debian">ftp://ftp.debian.org/debian</repository>
<repository type="plain" suite="unstable">http://www.morphix.org/debian</repository>
- <!-- Updates and security packages.. -->
- <!-- <repository type="debian" suite="etch/updates">http://ftp.debian.org/debian/debian-security/</repository> -->
+ <repository type="debian" suite="etch/updates">http://ftp.debian.org/debian/debian-security/</repository>
</repositorylist>
<description>Morphix Live Kiosk mainmodule. Outline template, LiveCD will have a single application running full screen</description>
<type>mainmod</type>
- <suite>sid</suite>
+ <suite>etch</suite>
<packagelist>
-<!-- remove exim4 exim4-base exim4-config mailx ? -->
<packagereq>alsa-base</packagereq>
<packagereq>alsa-utils</packagereq>
<packagereq>bzip2</packagereq>
@@ -29,7 +27,6 @@
<packagereq>menu</packagereq>
<packagereq>menu-xdg</packagereq>
<packagereq>module-init-tools</packagereq> <!-- necessary for kernels 2.5+ -->
-<packagereq>most</packagereq>
<packagereq>mozplugger</packagereq>
<packagereq>pcmcia-cs</packagereq>
<packagereq>perl-modules</packagereq>
@@ -58,19 +55,11 @@
<!-- These alternatives do not work well yet - hence comment out -->
<!-- <packagereq>gcjwebplugin</packagereq> -->
<!-- <packagereq>kaffe</packagereq> -->
-
<!-- Used for testing/debuging version -->
-<!-- <packagereq>xterm</packagereq> -->
<!-- <packagereq>openssh-server</packagereq> -->
</packagelist>
-<!-- Stop bookmarks toolbar from appearing -->
-<retrieve>
- <from>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/morphixlivekiosk/misc/localstore.rdf</from>
- <to>/etc/iceweasel/profile/</to>
- </retrieve>
-
-<!-- The single application does not neet documentation or manuals -->
+<!-- The single application does not neet documentation, manuals or other consoles -->
<commandlist>
<command>rm -rf /usr/share/doc</command>
<command>rm -rf /usr/share/man</command>
Added: trunk/mmaker/utils/auto-testing/Required-Packages.txt
===================================================================
--- trunk/mmaker/utils/auto-testing/Required-Packages.txt (rev 0)
+++ trunk/mmaker/utils/auto-testing/Required-Packages.txt 2007-06-23 07:59:36 UTC (rev 2525)
@@ -0,0 +1,1010 @@
+imagemagick
+debian-multimedia-keyring
+ffmpeg
+ffmpeg2theora
+mplayer
+morphing-tools
+subversion-tools
+qemu
+rsync
+mkisofs
+mencoder
+build-essential
+debhelper
+
+Desired=Unknown/Install/Remove/Purge/Hold
+| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed
+|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)
+||/ Name Version Description
++++-=================================-===============================-============================================
+ii acpid 1.0.4-7.1 Utilities for using ACPI power management
+ii adduser 3.102 Add and remove users and groups
+ii alacarte 0.11.3-1 easy GNOME menu editing tool
+ii alsa-base 1.0.13-5 ALSA driver configuration files
+ii alsa-utils 1.0.13-2 ALSA utilities
+ii anacron 2.3-13 cron-like program that doesn't go by time
+ii apt 0.6.46.4-0.1 Advanced front-end for dpkg
+ii apt-utils 0.6.46.4-0.1 APT utility programs
+ii aptitude 0.4.4-4 terminal-based apt frontend
+ii at 3.1.10 Delayed job execution and batch processing
+ii avahi-daemon 0.6.16-5 Avahi mDNS/DNS-SD daemon
+ii base-files 4.0.0 Debian base system miscellaneous files
+ii base-passwd 3.5.11 Debian base system master password and group
+ii bash 3.1dfsg-8 The GNU Bourne Again SHell
+ii bc 1.06-20 The GNU bc arbitrary precision calculator la
+ii bind9-host 1:9.4.1-1 Version of 'host' bundled with BIND 9.X
+ii binutils 2.17cvs20070426-8 The GNU assembler, linker and binary utiliti
+ii bittorrent 3.4.2-11 Original BitTorent client - console tools
+ii bluez-gnome 0.6-1 Bluetooth utilities for GNOME
+ii bochsbios 2.3-2 BIOS for the Bochs emulator
+ii bsdmainutils 6.1.6 collection of more utilities from FreeBSD
+ii bsdutils 1:2.12r-19 Basic utilities from 4.4BSD-Lite
+ii bsh 2.0b4-4 Java scripting environment (BeanShell) Versi
+ii bug-buddy 2.14.0-4 GNOME Desktop Environment bug reporting tool
+ii build-essential 11.3 informational list of build-essential packag
+ii busybox 1:1.1.3-4 Tiny utilities for small and embedded system
+ii bzip2 1.0.3-6 high-quality block-sorting file compressor -
+ii ca-certificates 20070303 Common CA Certificates PEM files
+ii capplets-data 1:2.14.2-7 configuration applets for GNOME 2 - data fil
+ii cdebootstrap 0.3.15 Bootstrap a Debian system
+ii cdrdao 1:1.2.2-6 records CDs in Disk-At-Once (DAO) mode
+ii cloop-utils 2.05~20060829-1 Tools for handling with cloop compressed vol
+ii console-common 0.7.69 Basic infrastructure for text console config
+ii console-data 2:1.01-7 Keymaps, fonts, charset maps, fallback table
+ii console-tools 1:0.2.3dbs-65 Linux console and font utilities
+ii coreutils 5.97-5.3 The GNU core utilities
+ii cpio 2.7-3 GNU cpio -- a program to manage archives of
+ii cpp 4:4.1.1-15 The GNU C preprocessor (cpp)
+ii cpp-4.1 4.1.1-21 The GNU C preprocessor
+ii cron 3.0pl1-100 management of regular background processing
+ii cupsys 1.2.11-2 Common UNIX Printing System(tm) - server
+ii cupsys-bsd 1.2.11-2 Common UNIX Printing System(tm) - BSD comman
+ii cupsys-client 1.2.11-2 Common UNIX Printing System(tm) - client pro
+ii cupsys-common 1.2.11-2 Common UNIX Printing System(tm) - common fil
+ii cupsys-driver-gutenprint 5.0.0-3 printer drivers for CUPS
+ii dbus 1.0.2-1 simple interprocess messaging system
+ii dbus-1-utils 1.0.2-1 simple interprocess messaging system (utilit
+ii dc 1.06-20 The GNU dc arbitrary precision reverse-polis
+ii debconf 1.5.13 Debian configuration management system
+ii debconf-i18n 1.5.13 full internationalization support for debcon
+ii debhelper 5.0.50 helper programs for debian/rules
+ii debian-archive-keyring 2007.02.19-0.1 GnuPG archive keys of the Debian archive
+ii debian-multimedia-keyring 2007.02.14 GnuPG archive key of the debian-multimedia r
+ii debianutils 2.19 Miscellaneous utilities specific to Debian
+ii defoma 0.11.10-0.1 Debian Font Manager -- automatic font config
+ii deskbar-applet 2.14.2-4.2 universal search and navigation bar for GNOM
+ii desktop-base 4.0.3 common files for the Debian Desktop
+ii desktop-file-utils 0.12-1 Utilities for .desktop files
+ii devscripts 2.10.4 Scripts to make the life of a Debian Package
+ii dhcdbd 2.0-5 D-Bus interface to the ISC DHCP client
+ii dhcp3-client 3.0.4-14 DHCP Client
+ii dhcp3-common 3.0.4-14 Common files used by all the dhcp3* packages
+ii dictionaries-common 0.81.2 Common utilities for spelling dictionary too
+ii diff 2.8.1-12 File comparison utilities
+ii discover1 1.7.21 hardware identification system
+ii discover1-data 2.2007.05.11 Data lists for Discover hardware detection s
+ii dmidecode 2.9-1 Dump Desktop Management Interface data
+ii dnsutils 1:9.4.1-1 Clients provided with BIND
+ii doc-debian 3.1.5 Debian Project documentation, Debian FAQ and
+ii doc-linux-text 2007.05-1 Linux HOWTOs and FAQs in ASCII format
+ii docbook-xml 4.5-4 standard XML documentation system, for softw
+ii dpkg 1.14.4 package maintenance system for Debian
+ii dpkg-dev 1.14.4 package building tools for Debian
+ii dselect 1.14.4 user tool to manage Debian packages
+ii dvd+rw-tools 7.0-7 DVD+-RW/R tools
+ii e2fslibs 1.39+1.40-WIP-2006.11.14+dfsg-2 ext2 filesystem libraries
+ii e2fsprogs 1.39+1.40-WIP-2006.11.14+dfsg-2 ext2 file system utilities and libraries
+ii ed 0.2-20 The classic unix line editor
+ii eject 2.1.5-2 ejects CDs and operates CD-Changers under Li
+ii ekiga 2.0.3-6 H.323 and SIP compatible VOIP client
+ii eog 2.16.3-3 Eye of Gnome graphics viewer program
+ii epiphany-browser 2.14.3-6 Intuitive GNOME web browser
+ii epiphany-extensions 2.14.1.1-3 Extensions for Epiphany web browser
+ii esound 0.2.36-3 Enlightened Sound Daemon - Support binaries
+ii esound-common 0.2.36-3 Enlightened Sound Daemon - Common files
+ii evince 0.4.0-5 Document (postscript, pdf) viewer
+ii evolution 2.6.3-6 groupware suite with mail client and organiz
+ii evolution-common 2.6.3-6 architecture independent files for Evolution
+ii evolution-data-server 1.6.3-5 evolution database backend server
+ii evolution-data-server-common 1.6.3-5 architecture independent files for Evolution
+ii evolution-exchange 2.6.3.dfsg-1 Exchange plugin for the Evolution groupware
+ii evolution-plugins 2.6.3-6 standard plugins for Evolution
+ii evolution-webcal 2.6.0-1+b1 webcal: URL handler for GNOME and Evolution
+ii exim4 4.63-17 metapackage to ease exim MTA (v4) installati
+ii exim4-base 4.63-17 support files for all exim MTA (v4) packages
+ii exim4-config 4.63-17 configuration for the exim MTA (v4)
+ii exim4-daemon-light 4.63-17 lightweight exim MTA (v4) daemon
+ii fast-user-switch-applet 2.14.2-1 Applet for the GNOME panel providing a menu
+ii fbset 2.1-19 framebuffer device maintenance program
+ii ffmpeg 3:20070329-0.0 audio/video encoder, streaming server & audi
+ii ffmpeg2theora 0.16-2+b1 Theora video encoder using ffmpeg
+ii file 4.20-8 Determines file type using "magic" numbers
+ii file-roller 2.14.4-3 an archive manager for GNOME
+ii findutils 4.2.31-1 utilities for finding files--find, xargs, an
+ii finger 0.17-11 user information lookup program
+ii fontconfig 2.4.2-1.2 generic font configuration library - support
+ii fontconfig-config 2.4.2-1.2 generic font configuration library - configu
+ii foomatic-db 20061031-1 linuxprinting.org printer support - database
+ii foomatic-db-engine 3.0.2-20061031-1 linuxprinting.org printer support - programs
+ii foomatic-db-gutenprint 5.0.0-3 linuxprinting.org printer support - database
+ii foomatic-db-hpijs 20061031-1 linuxprinting.org printer support - database
+ii foomatic-filters 3.0.2-20061031-1.2 linuxprinting.org printer support - filters
+ii foomatic-filters-ppds 20061104-1 linuxprinting.org printer support - prebuilt
+ii foomatic-gui 0.7.7 GNOME interface for configuring the Foomatic
+ii fortune-mod 1:1.99.1-3 provides fortune cookies on demand
+ii fortunes-min 1:1.99.1-3 Data files containing fortune cookies
+ii ftp 0.17-16 The FTP client
+ii g++ 4:4.1.1-15 The GNU C++ compiler
+ii g++-4.1 4.1.1-21 The GNU C++ compiler
+ii gaim 1:2.0.0+beta5-11 multi-protocol instant messaging client
+ii gaim-data 1:2.0.0+beta5-11 multi-protocol instant messaging client - da
+ii gamin 0.1.8-2 File and directory monitoring system
+ii gcalctool 5.8.25-1 A GTK2 desktop calculator
+ii gcc 4:4.1.1-15 The GNU C compiler
+ii gcc-3.4-base 3.4.6-5 The GNU Compiler Collection (base package)
+ii gcc-4.1 4.1.1-21 The GNU C compiler
+ii gcc-4.1-base 4.1.1-21 The GNU Compiler Collection (base package)
+ii gcc-4.2-base 4.2-20070528-1 The GNU Compiler Collection (base package)
+ii gcj-4.1-base 4.1.1-20 The GNU Compiler Collection (gcj base packag
+ii gconf-editor 2.16.0-2 An editor for the GConf configuration system
+ii gconf2 2.18.0.1-3 GNOME configuration database system (support
+ii gconf2-common 2.18.0.1-3 GNOME configuration database system (common
+ii gdb 6.4.90.dfsg-1 The GNU Debugger
+ii gdebi 0.1.6-0.1 Simple tool to install deb files
+ii gdm 2.16.4-1.1 GNOME Display Manager
+ii gedit 2.14.4-9 official text editor of the GNOME desktop en
+ii gedit-common 2.14.4-9 official text editor of the GNOME desktop en
+ii genisoimage 9:1.1.6-1 Creates ISO-9660 CD-ROM filesystem images
+ii gettext 0.16.1-1 GNU Internationalization utilities
+ii gettext-base 0.16.1-1 GNU Internationalization utilities for the b
+ii gfxboot 2.4-1 create menu message files suitable for bootl
+ii gij 4:4.1.1-15 The GNU Java bytecode interpreter
+ii gij-4.1 4.1.1-20 The GNU Java bytecode interpreter
+ii gimp 2.2.13-1 The GNU Image Manipulation Program
+ii gimp-data 2.2.13-1 Data files for The GIMP
+ii gimp-print 5.0.0-3 print plugin for the GIMP
+ii gksu 2.0.0-4 graphical frontend to su
+ii gnome-about 2.18.2-1 The GNOME about box
+ii gnome-applets 2.14.3-6 Various applets for GNOME 2 panel - binary f
+ii gnome-applets-data 2.14.3-6 Various applets for GNOME 2 panel - data fil
+ii gnome-backgrounds 2.16.2-1 a set of backgrounds packaged with the GNOME
+ii gnome-btdownload 0.0.28-1 Gnome interface for 'executing' BitTorrent f
+ii gnome-cards-data 1:2.16.3-1 data files for the GNOME card games
+ii gnome-control-center 1:2.14.2-7 utilities to configure the GNOME desktop
+ii gnome-core 1:2.14.3.6 The GNOME Desktop Environment -- essential c
+ii gnome-cups-manager 0.31-3 CUPS printer admin tool for GNOME
+ii gnome-desktop-data 2.18.2-1 Common files for GNOME 2 desktop apps
+ii gnome-desktop-environment 1:2.14.3.6 The GNOME Desktop Environment
+ii gnome-doc-utils 0.10.3-1 a collection of documentation utilities for
+ii gnome-games 1:2.16.3-1 games for the GNOME desktop
+ii gnome-games-data 1:2.16.3-1 data files for the GNOME games
+ii gnome-icon-theme 2.18.0-2 GNOME Desktop icon theme
+ii gnome-keyring 0.8.1-2 GNOME keyring services (daemon and tools)
+ii gnome-keyring-manager 2.16.0-2 keyring management program for the GNOME des
+ii gnome-media 2.14.2-4 GNOME media utilities
+ii gnome-media-common 2.14.2-4 GNOME media utilities - common files
+ii gnome-menus 2.18.2-1 an implementation of the freedesktop menu sp
+ii gnome-mime-data 2.18.0-1 base MIME and Application database for GNOME
+ii gnome-netstatus-applet 2.12.1-1 Network status applet for GNOME 2
+ii gnome-nettool 2.14.2-1 network information tool for GNOME
+ii gnome-panel 2.14.3-5 launcher and docking facility for GNOME 2
+ii gnome-panel-data 2.14.3-5 common files for GNOME 2 panel
+ii gnome-power-manager 2.14.3-3+b1 frontend for gnome-powermanager
+ii gnome-screensaver 2.14.3-3 GNOME screen saver and locker
+ii gnome-session 2.14.3-6 The GNOME 2 Session Manager
+ii gnome-system-monitor 2.14.5-1 Process viewer and system resource monitor f
+ii gnome-system-tools 2.14.0-3 Cross-platform configuration utilities for G
+ii gnome-terminal 2.14.2-2 The GNOME 2 terminal emulator application
+ii gnome-terminal-data 2.14.2-2 Data files for the GNOME terminal emulator
+ii gnome-themes 2.18.1-2 official themes for the GNOME 2 desktop
+ii gnome-themes-extras 0.9.0.deb0.2 various themes for the GNOME 2 desktop
+ii gnome-user-guide 2.18.1-1 GNOME user's guide
+ii gnome-utils 2.14.0.dfsg-5 GNOME desktop utilities
+ii gnome-volume-manager 1.5.15-2 GNOME daemon to auto-mount and manage media
+ii gnomebaker 0.6.0-7 application for CD/DVD creation in the GNOME
+ii gnupg 1.4.6-2 GNU privacy guard - a free PGP replacement
+ii gparted 0.3.3-2 GNOME partition editor
+ii gpgv 1.4.6-2 GNU privacy guard - signature verification t
+ii grdesktop 0.23-3 GNOME frontend for the rdesktop client
+ii grep 2.5.1.ds2-6 GNU grep, egrep and fgrep
+ii groff-base 1.18.1.1-12 GNU troff text-formatting system (base syste
+ii grub 0.97-27 GRand Unified Bootloader
+ii gs-common 0.3.13 Common files for different Ghostscript relea
+ii gs-esp 8.15.3.dfsg.1-1 The Ghostscript PostScript interpreter - ESP
+ii gsfonts 1:8.11+urwcyr1.0.7~pre41-3 Fonts for the Ghostscript interpreter(s)
+ii gstreamer0.10-alsa 0.10.13-2 GStreamer plugin for ALSA
+ii gstreamer0.10-esd 0.10.4-4 GStreamer plugin for ESD
+ii gstreamer0.10-ffmpeg 0.10.2-2 FFmpeg plugin for GStreamer
+ii gstreamer0.10-gnomevfs 0.10.13-2 GStreamer plugin for GnomeVFS
+ii gstreamer0.10-plugins-base 0.10.13-2 GStreamer plugins from the "base" set
+ii gstreamer0.10-plugins-good 0.10.4-4 GStreamer plugins from the "good" set
+ii gstreamer0.10-plugins-ugly 0.10.5-2 GStreamer plugins from the "ugly" set
+ii gtk2-engines 1:2.10.2-1 theme engines for GTK+ 2.x
+ii gtk2-engines-pixbuf 2.10.12-2 Pixbuf-based theme for GTK+ 2.x
+ii gtk2-engines-xfce 2.4.1-1 A GTK+-2.0 theme engine for Xfce
+ii gtkhtml3.8 3.12.1-2 HTML rendering/editing library - bonobo comp
+ii gucharmap 1:1.6.0-1 Unicode character picker and font browser
+ii guile-1.6-libs 1.6.8-6 Main Guile libraries
+ii gzip 1.3.9-2 The GNU compression utility
+ii hal 0.5.9-3 Hardware Abstraction Layer
+ii hal-info 20070516-1 Hardware Abstraction Layer - fdi files
+ii hardinfo 0.4.2.1.svn30042007-1 Displays system information
+ii hicolor-icon-theme 0.10-1 default fallback theme for FreeDesktop.org i
+ii hostname 2.93 utility to set/show the host name or domain
+ii hotkey-setup 0.1-17 auto-configures laptop hotkeys
+ii hpijs 2.6.10+1.6.10-3 HP Linux Printing and Imaging - gs IJS drive
+ii hpijs-ppds 2.6.10+1.6.10-3 HP Linux Printing and Imaging - HPIJS PPD fi
+ii hplip 1.6.10-3 HP Linux Printing and Imaging System (HPLIP)
+ii hplip-data 1.6.10-3 HP Linux Printing and Imaging - data files
+ii html2text 1.3.2a-3 An advanced HTML to text converter
+ii iamerican 3.1.20.0-4.4 An American English dictionary for ispell
+ii ibritish 3.1.20.0-4.4 A British English dictionary for ispell
+ii icedax 9:1.1.6-1 Creates WAV files from audio CDs
+ii iceweasel 2.0.0.3-1 lightweight web browser based on Mozilla
+ii iceweasel-gnome-support 2.0.0.3-1 Support for Gnome in Iceweasel
+ii iceweasel-l10n-en-gb 2.0.0.3+debian-2 English (Great Britain) language package for
+ii ifupdown 0.6.8 high level tools to configure network interf
+ii ijsgutenprint 5.0.0-3 inkjet server - Ghostscript driver for Guten
+ii imagemagick 7:6.2.4.5.dfsg1-0.14 Image manipulation programs
+ii industrial-cursor-theme 0.6.1.3 flat-looking cursor theme for X
+ii info 4.8.dfsg.1-6 Standalone GNU Info documentation browser
+ii initramfs-tools 0.87b tools for generating an initramfs
+ii initscripts 2.86.ds1-38 Scripts for initializing and shutting down t
+ii installation-report 2.29 system installation report
+ii intltool-debian 0.35.0+20060710.1 Help i18n of RFC822 compliant config files
+ii iproute 20061002-4 Professional tools to control the networking
+ii iptables 1.3.6.0debian1-5 administration tools for packet filtering an
+ii iputils-arping 3:20070202-1 Tool to send ICMP echo requests to an ARP ad
+ii iputils-ping 3:20070202-1 Tools to test the reachability of network ho
+ii iso-codes 1.0a-1 ISO language, territory, currency codes and
+ii ispell 3.1.20.0-4.4 International Ispell (an interactive spellin
+ii kde-i18n-engb 4:3.5.6-1 British English (en_GB) internationalized (i
+ii kdelibs-data 4:3.5.5a.dfsg.1-8 core shared data for all KDE applications
+ii kdelibs4c2a 4:3.5.5a.dfsg.1-8 core libraries and binaries for all KDE appl
+ii klibc-utils 1.4.34-1 small statically-linked utilities built with
+ii klogd 1.4.1-20 Kernel Logging Daemon
+ii lapack3 3.0.20000531a-6 library of linear algebra routines 3 - share
+ii laptop-detect 0.12.1-0.1 attempt to detect a laptop
+ii less 394-4 Pager program similar to more
+ii liba52-0.7.4 0.7.4-11 library for decoding ATSC A/52 streams
+ii libaa1 1.4p5-32 ascii art library
+ii libacl1 2.2.42-1 Access control list shared library
+ii libao2 0.8.8-2 Cross Platform Audio Output Library
+ii libapm1 3.2.2-8.1 Library for interacting with APM driver in k
+ii libapr1 1.2.7-8.2 The Apache Portable Runtime Library
+ii libaprutil1 1.2.7+dfsg-2+b1 The Apache Portable Runtime Utility Library
+ii libart-2.0-2 2.3.19-3 Library of functions for 2D graphics - runti
+ii libarts1c2a 1.5.5-1 aRts sound system core components
+ii libartsc0 1.5.5-1 aRts sound system C support library
+ii libasound2 1.0.13-2 ALSA library
+ii libaspell15 0.60.5-1 GNU Aspell spell-checker runtime library
+ii libasyncns0 0.3-1 Asyncronous name service query library
+ii libatk1.0-0 1.18.0-2 The ATK accessibility toolkit
+ii libatm1 2.4.1-17 shared library for ATM (Asynchronous Transfe
+ii libattr1 1:2.4.32-1.1 Extended attribute shared library
+ii libaudio2 1.9-2 The Network Audio System (NAS). (shared libr
+ii libaudiofile0 0.2.6-6 Open-source version of SGI's audiofile libra
+ii libavahi-client3 0.6.16-5 Avahi client library
+ii libavahi-common-data 0.6.16-5 Avahi common data files
+ii libavahi-common3 0.6.16-5 Avahi common library
+ii libavahi-compat-howl0 0.6.16-5 Avahi Howl compatibility library
+ii libavahi-core4 0.6.16-5 Avahi's embeddable mDNS/DNS-SD library
+ii libavahi-glib1 0.6.16-5 Avahi glib integration library
+ii libavahi-qt3-1 0.6.16-5 Avahi Qt3 integration library
+ii libavc1394-0 0.5.3-1+b1 control IEEE 1394 audio/video devices
+ii libavcodec0d 0.cvs20060823-8 ffmpeg codec library
+ii libavcodeccvs51 3:20070329-0.0 library to encode decode multimedia streams
+ii libavformat0d 0.cvs20060823-8 ffmpeg file format library
+ii libavformatcvs51 3:20070329-0.0 ffmpeg file format library
+ii libavutilcvs49 3:20070329-0.0 avutil shared libraries
+ii libbind9-0 1:9.3.4-2 BIND9 Shared Library used by BIND
+ii libbind9-30 1:9.4.1-1 BIND9 Shared Library used by BIND
+ii libblkid1 1.39+1.40-WIP-2006.11.14+dfsg-2 block device id library
+ii libbluetooth2 3.10-1 Library to use the BlueZ Linux Bluetooth sta
+ii libbonobo2-0 2.18.0-2 Bonobo CORBA interfaces library
+ii libbonobo2-common 2.18.0-2 Bonobo CORBA interfaces library -- support f
+ii libbonoboui2-0 2.18.0-5 The Bonobo UI library
+ii libbonoboui2-common 2.18.0-5 The Bonobo UI library -- common files
+ii libbz2-1.0 1.0.3-6 high-quality block-sorting file compressor l
+ii libc6 2.5-9+b1 GNU C Library: Shared libraries
+ii libc6-dev 2.5-9+b1 GNU C Library: Development Libraries and Hea
+ii libc6-i686 2.5-9+b1 GNU C Library: Shared libraries [i686 optimi
+ii libcaca0 0.99.beta11.debian-3 colour ASCII art library
+ii libcairo-perl 1.01-1 Perl interface to the Cairo graphics library
+ii libcairo2 1.4.6-1.1 The Cairo 2D vector graphics library
+ii libcamel1.2-8 1.6.3-5 The Evolution MIME message handling library
+ii libcap1 1:1.10-14 support for getting/setting POSIX.1e capabil
+ii libcdio6 0.76-1 library to read and control CD-ROM
+ii libcdparanoia0 3.10+debian~pre0-5 audio extraction tool for sampling CDs (libr
+ii libcomerr2 1.39+1.40-WIP-2006.11.14+dfsg-2 common error description library
+ii libconsole 1:0.2.3dbs-65 Shared libraries for Linux console and font
+ii libcpufreq0 002-2 shared library to deal with the cpufreq Linu
+ii libcroco3 0.6.1-1 a generic Cascading Style Sheet (CSS) parsin
+ii libcucul0 0.99.beta11.debian-3 low-level Unicode character drawing library
+ii libcupsimage2 1.2.11-2 Common UNIX Printing System(tm) - image libs
+ii libcupsys2 1.2.11-2 Common UNIX Printing System(tm) - libs
+ii libcurl3 7.15.5-1 Multi-protocol file transfer library
+ii libdaemon0 0.10-1 lightweight C library for daemons
+ii libdatrie0 0.1.1-4 Double-array trie library
+ii libdb4.2 4.2.52+dfsg-2 Berkeley v4.2 Database Libraries [runtime]
+ii libdb4.3 4.3.29-8 Berkeley v4.3 Database Libraries [runtime]
+ii libdb4.4 4.4.20-8 Berkeley v4.4 Database Libraries [runtime]
+ii libdb4.5 4.5.20-1 Berkeley v4.5 Database Libraries [runtime]
+ii libdbus-1-3 1.0.2-1 simple interprocess messaging system
+ii libdbus-glib-1-2 0.73-2 simple interprocess messaging system (GLib-b
+ii libdc1394-13 1.1.0-3+b1 high level programming interface for IEEE139
+ii libdebian-installer-extra4 0.50 Library of some extra debian-installer funct
+ii libdebian-installer4 0.50 Library of common debian-installer functions
+ii libdevmapper1.02 2:1.02.08-1 The Linux Kernel Device Mapper userspace lib
+ii libdirectfb-0.9-25 0.9.25.1-5 direct frame buffer graphics - shared librar
+ii libdiscover1 1.7.21 hardware identification library
+ii libdjvulibre15 3.5.19-2 Runtime support for the DjVu image format
+ii libdmx1 1:1.0.2-2 X11 Distributed Multihead extension library
+ii libdns22 1:9.3.4-2 DNS Shared Library used by BIND
+ii libdns32 1:9.4.1-1 DNS Shared Library used by BIND
+ii libdrm2 2.3.0-4 Userspace interface to kernel DRM services -
+ii libdv4 1.0.0-1 software library for DV format digital video
+ii libdvdnav4 0.1.10-0.2 The DVD navigation library
+ii libdvdread3 0.9.7-3 library for reading DVDs
+ii libebook1.2-5 1.6.3-5 Client library for evolution address books
+ii libecal1.2-6 1.6.3-5 Client library for evolution calendars
+ii libedata-book1.2-2 1.6.3-5 Backend library for evolution address books
+ii libedata-cal1.2-5 1.6.3-5 Backend library for evolution calendars
+ii libedataserver1.2-7 1.6.3-5 Utility library for evolution data servers
+ii libedataserverui1.2-6 1.6.3-5 GUI utility library for evolution data serve
+ii libedit2 2.9.cvs.20050518-3 BSD editline and history libraries
+ii libeel2-2.14 2.14.3-5 Eazel Extensions Library (for GNOME2)
+ii libeel2-data 2.14.3-5 Eazel Extensions Library - data files (for G
+ii libegroupwise1.2-10 1.6.3-5 Client library for accessing groupwise POA t
+ii libenchant1c2a 1.3.0-3 a wrapper library for various spell checker
+ii libesd0 0.2.36-3 Enlightened Sound Daemon - Shared libraries
+ii libevent1 1.1a-2 An asynchronous event notification library
+ii libexchange-storage1.2-1 1.6.3-5 Backend library for evolution calendars
+ii libexif12 0.6.15-1 library to parse EXIF files
+ii libexo-0.3-0 0.3.1.12rc2-1 Library with extensions for Xfce
+ii libexpat1 1.95.8-3.4 XML parsing C library - runtime library
+ii libfaac0 1.25-0.1 an AAC audio encoder - library files
+ii libfaad0 2.5-4 freeware Advanced Audio Decoder - runtime fi
+ii libflac7 1.1.2-6 Free Lossless Audio Codec - runtime C librar
+ii libfontconfig1 2.4.2-1.2 generic font configuration library - runtime
+ii libfontenc1 1:1.0.4-2 X11 font encoding library
+ii libfreetype6 2.2.1-6 FreeType 2 font engine, shared library files
+ii libfribidi0 0.10.7-4 Free Implementation of the Unicode BiDi algo
+ii libfs6 2:1.0.0-4 X11 Font Services library
+ii libg2c0 1:3.4.6-5 Runtime library for GNU Fortran 77 applicati
+ii libgail-common 1.8.11-4 GNOME Accessibility Implementation Library -
+ii libgail17 1.8.11-4 GNOME Accessibility Implementation Library -
+ii libgamin0 0.1.8-2 Client library for the gamin file and direct
+ii libgc1c2 1:6.8-1 conservative garbage collector for C and C++
+ii libgcc1 1:4.2-20070528-1 GCC support library
+ii libgcj-bc 4.1.1-21 Link time only library for use with gcj
+ii libgcj-common 1:4.1.1-21 Java runtime library (common files)
+ii libgcj7-0 4.1.1-20 Java runtime library for use with gcj
+ii libgconf2-4 2.18.0.1-3 GNOME configuration database system (shared
+ii libgcrypt11 1.2.4-2 LGPL Crypto library - runtime library
+ii libgda2-3 1.2.3-5+b1 GNOME Data Access library for GNOME2
+ii libgda2-common 1.2.3-5 Common files for GNOME Data Access library f
+ii libgdbm3 1.8.3-3 GNU dbm database routines (runtime version)
+ii libgdl-1-0 0.7.3-1 GNOME DevTool libraries
+ii libgdl-1-common 0.7.3-1 GNOME DevTool libraries - common files
+ii libggi2 1:2.2.1-5 General Graphics Interface runtime libraries
+ii libgii1 1:1.0.1-3 General Input Interface runtime libraries
+ii libgii1-target-x 1:1.0.1-3 General Input Interface X input target
+ii libgimp2.0 2.2.13-1 Libraries necessary to Run the GIMP
+ii libgksu1.2-0 1.3.8-1 library providing su and sudo functionality
+ii libgksu2-0 2.0.3-9 library providing su and sudo functionality
+ii libgksuui1.0-1 1.0.7-2 a graphical fronted to su library
+ii libgl1-mesa-glx 6.5.2-5 A free implementation of the OpenGL API -- G
+ii libglade2-0 1:2.6.0-4 library to load .glade files at runtime
+ii libglib-perl 1:1.144-1 Perl interface to the GLib and GObject libra
+ii libglib2.0-0 2.12.12-1 The GLib library of C routines
+ii libglibmm-2.4-1c2a 2.12.7-1 C++ wrapper for the GLib toolkit (shared lib
+ii libglu1-mesa 6.5.2-5 The OpenGL utility library (GLU)
+ii libgnome-desktop-2 2.18.2-1 Utility library for loading .desktop files -
+ii libgnome-keyring0 0.8.1-2 GNOME keyring services library
+ii libgnome-media0 2.14.2-4 runtime libraries for the GNOME media utilit
+ii libgnome-menu2 2.18.2-1 an implementation of the freedesktop menu sp
+ii libgnome-pilot2 2.0.15-2 Support libraries for gnome-pilot
+ii libgnome-window-settings1 1:2.14.2-7 Utility library for getting window manager s
+ii libgnome2-0 2.18.0-4 The GNOME 2 library - runtime files
+ii libgnome2-canvas-perl 1.002-1+b1 Perl interface to the GNOME canvas library
+ii libgnome2-common 2.18.0-4 The GNOME 2 library - common files
+ii libgnome2-perl 1.040-1 Perl interface to the GNOME libraries
+ii libgnome2-vfs-perl 1.060-1 Perl interface to the 2.x series of the GNOM
+ii libgnomecanvas2-0 2.14.0-2 A powerful object-oriented display - runtime
+ii libgnomecanvas2-common 2.14.0-2 A powerful object-oriented display - common
+ii libgnomecups1.0-1 0.2.2-5 GNOME library for CUPS interaction
+ii libgnomecupsui1.0-1c2a 0.31-3 UI extensions to libgnomecups
+ii libgnomeprint2.2-0 2.18.0-2 The GNOME 2.2 print architecture - runtime f
+ii libgnomeprint2.2-data 2.18.0-2 The GNOME 2.2 print architecture - data file
+ii libgnomeprintui2.2-0 2.18.0-2 GNOME 2.2 print architecture User Interface
+ii libgnomeprintui2.2-common 2.18.0-2 GNOME 2.2 print architecture User Interface
+ii libgnomeui-0 2.18.1-2 The GNOME 2 libraries (User Interface) - run
+ii libgnomeui-common 2.18.1-2 The GNOME 2 libraries (User Interface) - com
+ii libgnomevfs2-0 1:2.18.1-2 GNOME Virtual File System (runtime libraries
+ii libgnomevfs2-bin 1:2.18.1-2 GNOME Virtual File System (support binaries)
+ii libgnomevfs2-common 1:2.18.1-2 GNOME Virtual File System (common files)
+ii libgnomevfs2-extra 1:2.18.1-2 GNOME Virtual File System (extra modules)
+ii libgnutls13 1.6.3-1 the GNU TLS library - runtime library
+ii libgpg-error0 1.4-2 library for common error values and messages
+ii libgphoto2-2 2.3.1-5 gphoto2 digital camera library
+ii libgphoto2-port0 2.3.1-5 gphoto2 digital camera port library
+ii libgpmg1 1.19.6-25 General Purpose Mouse - shared library
+ii libgpod0 0.3.2-1.1 a library to read and write songs and artwor
+ii libgsf-1-114 1.14.3-1 Structured File Library - runtime version
+ii libgsf-1-common 1.14.3-1 Structured File Library - common files
+ii libgsm1 1.0.10-13 Shared libraries for GSM speech compressor
+ii libgssapi2 0.11-1 A mechanism-switch gssapi library
+ii libgstreamer-plugins-base0.10-0 0.10.13-2 GStreamer libraries from the "base" set
+ii libgstreamer0.10-0 0.10.13-1 Core GStreamer libraries and elements
+ii libgtk2-perl 1:1.140-1 Perl interface to the 2.x series of the Gimp
+ii libgtk2.0-0 2.10.12-2 The GTK+ graphical user interface library
+ii libgtk2.0-bin 2.10.12-2 The programs for the GTK+ graphical user int
+ii libgtk2.0-common 2.10.12-2 Common files for the GTK+ graphical user int
+ii libgtkhtml2-0 2.11.0-3 HTML rendering/editing library - runtime fil
+ii libgtkhtml3.8-15 3.12.1-2 HTML rendering/editing library - runtime fil
+ii libgtkmm-2.4-1c2a 1:2.8.8-1 C++ wrappers for GTK+ 2.4 (shared libraries)
+ii libgtksourceview-common 1.8.5-1 common files for the GTK+ syntax highlightin
+ii libgtksourceview1.0-0 1.8.5-1 shared libraries for the GTK+ syntax highlig
+ii libgtkspell0 2.0.10-3+b1 a spell-checking addon for GTK's TextView wi
+ii libgtop2-7 2.14.8-2 gtop system monitoring library
+ii libgtop2-common 2.14.8-2 common files for the gtop system monitoring
+ii libgucharmap4 1:1.6.0-1 Unicode browser widget library (shared libra
+ii libguile-ltdl-1 1.6.8-6 Guile's patched version of libtool's libltdl
+ii libgutenprint2 5.0.0-3 runtime for the Gutenprint printer driver li
+ii libgutenprintui2-1 5.0.0-3 runtime for the Gutenprint printer driver us
+ii libhal-storage1 0.5.9-3 Hardware Abstraction Layer - shared library
+ii libhal1 0.5.9-3 Hardware Abstraction Layer - shared library
+ii libhsqldb-java 1.8.0.7-3 Java SQL database engine
+ii libhunspell-1.1-0 1.1.5-6 spell checker and morphological analyzer (sh
+ii libice6 1:1.0.3-2 X11 Inter-Client Exchange library
+ii libicu36 3.6-2 International Components for Unicode (librar
+ii libid3tag0 0.15.1b-10 ID3 tag reading library from the MAD project
+ii libidl0 0.8.8-0.1 library for parsing CORBA IDL files
+ii libidn11 0.6.5-1 GNU libidn library, implementation of IETF I
+ii libiec61883-0 1.1.0-2 an partial implementation of IEC 61883
+ii libieee1284-3 0.2.10-5 cross-platform library for parallel port acc
+ii libijs-0.35 0.35-3 IJS raster image transport protocol: shared
+ii libimlib2 1.3.0.0debian1-4 powerful image loading and rendering library
+ii libisc11 1:9.3.4-2 ISC Shared Library used by BIND
+ii libisc32 1:9.4.1-1 ISC Shared Library used by BIND
+ii libisccc0 1:9.3.4-2 Command Channel Library used by BIND
+ii libisccc30 1:9.4.1-1 Command Channel Library used by BIND
+ii libisccfg1 1:9.3.4-2 Config File Handling Library used by BIND
+ii libisccfg30 1:9.4.1-1 Config File Handling Library used by BIND
+ii libiw28 28-1 Wireless tools - library
+ii libjack0.100.0-0 0.101.1-2 JACK Audio Connection Kit (libraries)
+ii libjasper-1.701-1 1.701.0-2 The JasPer JPEG-2000 runtime library
+ii libjaxp1.3-java 1.3.03-5 Java XML parser and transformer APIs (DOM, S
+ii libjline-java 0.9.5-2 Java library for handling console input
+ii libjpeg62 6b-13 The Independent JPEG Group's JPEG runtime li
+ii libkeyutils1 1.2-3 Linux Key Management Utilities (library)
+ii libklibc 1.4.34-1 minimal libc subset for use with initramfs
+ii libkpathsea4 3.0-30 path search library for teTeX (runtime part)
+ii libkrb53 1.6.dfsg.1-4 MIT Kerberos runtime libraries
+ii liblame0 3.97-0.0 LAME Ain't an MP3 Encoder
+ii liblcms1 1.15-1 Color management library
+ii libldap2 2.1.30-13.4 OpenLDAP libraries
+ii liblircclient0 0.8.0-9.3 LIRC client library
+ii liblocale-gettext-perl 1.05-1 Using libc functions for internationalizatio
+ii liblockfile1 1.06.1 NFS-safe locking library, includes dotlockfi
+ii libltdl3 1.5.22-4 A system independent dlopen wrapper for GNU
+ii liblua50 5.0.3-2 Main interpreter library for the Lua 5.0 pro
+ii liblualib50 5.0.3-2 Extension library for the Lua 5.0 programmin
+ii liblwres30 1:9.4.1-1 Lightweight Resolver Library used by BIND
+ii liblwres9 1:9.3.4-2 Lightweight Resolver Library used by BIND
+ii liblzo1 1.08-3 data compression library (old version)
+ii liblzo2-2 2.02-2 data compression library
+ii libmad0 0.15.1b-2.1 MPEG audio decoder library
+ii libmagic1 4.20-8 File type determination library using "magic
+ii libmagick9 7:6.2.4.5.dfsg1-0.14 Image manipulation library
+ii libmdbtools 0.5.99.0.6pre1.0.20051109-4 mdbtools libraries
+ii libmetacity0 1:2.14.5-4 library of lightweight GTK2 based Window Man
+ii libmng1 1.0.9-1 Multiple-image Network Graphics library
+ii libmodplug0c2 1:0.7-5.2 shared libraries for mod music based on ModP
+ii libmozjs0d 1.8.0.11-2 The Mozilla SpiderMonkey JavaScript library
+ii libmpcdec3 1.2.2-1 Musepack (MPC) format library
+ii libmpeg2-4 0.4.1-1 MPEG1 and MPEG2 video decoder library
+ii libmusicbrainz4c2a 2.1.5-1 Second generation incarnation of the CD Inde
+ii libmyspell3c2 1:3.1-18 MySpell spellchecking library
+ii libnautilus-burn3 2.14.3-8+b1 Nautilus Burn Library - runtime version
+ii libnautilus-extension1 2.14.3-11+b1 libraries for nautilus components - runtime
+ii libncurses5 5.6-3 Shared libraries for terminal handling
+ii libncursesw5 5.6-3 Shared libraries for terminal handling (wide
+ii libneon25 0.25.5.dfsg-6 An HTTP and WebDAV client library
+ii libneon26 0.26.3-1 An HTTP and WebDAV client library
+ii libnewt0.52 0.52.2-10 Not Erik's Windowing Toolkit - text mode win
+ii libnfsidmap2 0.19-0 An nfs idmapping library
+ii libnl1-pre6 1.0~pre6-5 Library for dealing with netlink sockets
+ii libnm-glib0 0.6.4-7 network management framework (GLib shared li
+ii libnm-util0 0.6.4-7 network management framework (shared library
+ii libnotify1 0.4.4-3 sends desktop notifications to a notificatio
+ii libnspr4-0d 1.8.0.11-2 NetScape Portable Runtime Library
+ii libnss-mdns 0.10-0.1 NSS module for Multicast DNS name resolution
+ii libnss3-0d 1.8.0.11-2 Network Security Service libraries
+ii libogg0 1.1.3-2 Ogg Bitstream Library
+ii liboil0.3 0.3.12-1 Library of Optimized Inner Loops
+ii libopal-2.2.0 2.2.3.dfsg-3 Open Phone Abstraction Library - successor o
+ii libopenal0a 1:0.0.8-4 OpenAL is a portable library for 3D spatiali
+ii libopencdk8 0.5.13-2 Open Crypto Development Kit (OpenCDK) (runti
+ii libopenexr2c2a 1.2.2-4.3 runtime files for the OpenEXR image library
+ii liborbit2 1:2.14.7-0.1 libraries for ORBit2 - a CORBA ORB
+ii libosp5 1.5.2-3 Runtime library for OpenJade group's SP suit
+ii libpam-modules 0.79-4 Pluggable Authentication Modules for PAM
+ii libpam-runtime 0.79-4 Runtime support for the PAM library
+ii libpam0g 0.79-4 Pluggable Authentication Modules library
+ii libpanel-applet2-0 2.14.3-5 library for GNOME 2 panel applets
+ii libpango1.0-0 1.16.4-1 Layout and rendering of internationalized te
+ii libpango1.0-common 1.16.4-1 Modules and...
[truncated message content] |
|
From: <bms...@us...> - 2007-06-21 22:11:43
|
Revision: 2524
http://svn.sourceforge.net/morphix/?rev=2524&view=rev
Author: bmsleight
Date: 2007-06-21 15:11:39 -0700 (Thu, 21 Jun 2007)
Log Message:
-----------
Tweaking
Modified Paths:
--------------
trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/changelog
trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/preferences/prefs.js
Added Paths:
-----------
trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger-morphixlivekiosk.dirs
trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger-morphixlivekiosk.install
trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger-morphixlivekiosk.links
Removed Paths:
-------------
trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.dirs
trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.install
trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.links
Modified: trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/changelog
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/changelog 2007-06-20 20:43:23 UTC (rev 2523)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/changelog 2007-06-21 22:11:39 UTC (rev 2524)
@@ -1,3 +1,9 @@
+iceweasel-webconverger-morphixlivekiosk (6-17) unstable; urgency=low
+
+ * Minor tweaking.
+
+ -- Brendan Sleight <bms...@ba...> Thu, 21 Jun 2007 23:00:00 +0100
+
iceweasel-webconverger-morphixlivekiosk (6-16) unstable; urgency=low
* Updating to match upstream package.
Added: trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger-morphixlivekiosk.dirs
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger-morphixlivekiosk.dirs (rev 0)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger-morphixlivekiosk.dirs 2007-06-21 22:11:39 UTC (rev 2524)
@@ -0,0 +1,2 @@
+usr/share/iceweasel-extensions/webconverger
+usr/lib/iceweasel/extensions
Added: trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger-morphixlivekiosk.install
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger-morphixlivekiosk.install (rev 0)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger-morphixlivekiosk.install 2007-06-21 22:11:39 UTC (rev 2524)
@@ -0,0 +1 @@
+chrome.manifest defaults install.rdf content usr/share/iceweasel-extensions/webconverger/
Added: trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger-morphixlivekiosk.links
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger-morphixlivekiosk.links (rev 0)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger-morphixlivekiosk.links 2007-06-21 22:11:39 UTC (rev 2524)
@@ -0,0 +1 @@
+usr/share/iceweasel-extensions/webconverger usr/lib/iceweasel/extensions/{ee11fa88-036b-4661-bb04-d436f86bc06a}
Deleted: trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.dirs
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.dirs 2007-06-20 20:43:23 UTC (rev 2523)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.dirs 2007-06-21 22:11:39 UTC (rev 2524)
@@ -1,2 +0,0 @@
-usr/share/iceweasel-extensions/webconverger
-usr/lib/iceweasel/extensions
Deleted: trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.install
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.install 2007-06-20 20:43:23 UTC (rev 2523)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.install 2007-06-21 22:11:39 UTC (rev 2524)
@@ -1 +0,0 @@
-chrome.manifest defaults install.rdf content usr/share/iceweasel-extensions/webconverger/
Deleted: trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.links
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.links 2007-06-20 20:43:23 UTC (rev 2523)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.links 2007-06-21 22:11:39 UTC (rev 2524)
@@ -1 +0,0 @@
-usr/share/iceweasel-extensions/webconverger usr/lib/iceweasel/extensions/{ee11fa88-036b-4661-bb04-d436f86bc06a}
Modified: trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/preferences/prefs.js
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/preferences/prefs.js 2007-06-20 20:43:23 UTC (rev 2523)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/preferences/prefs.js 2007-06-21 22:11:39 UTC (rev 2524)
@@ -1,7 +1,7 @@
/* Webconverger.com
*/
-pref("browser.startup.homepage", "http://portal.webconverger.com");
+pref("browser.startup.homepage", "http://www.morphix.org");
pref("accessibility.typeaheadfind.flashBar", 0);
pref("app.update.enabled", false);
pref("browser.download.dir", "/tmp");
@@ -53,7 +53,6 @@
// pref("print.always_print_silent",true);
// pref("print.show_print_progress",false);
-pref("rkiosk.navbar", true);
// BETA Spell check all fields
pref("layout.spellcheck.default", 2)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-06-20 20:43:30
|
Revision: 2523
http://svn.sourceforge.net/morphix/?rev=2523&view=rev
Author: bmsleight
Date: 2007-06-20 13:43:23 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Updating to match upstream package
Modified Paths:
--------------
trunk/morphixlivekiosk/iceweasel-webconverger-6/chrome.manifest
trunk/morphixlivekiosk/iceweasel-webconverger-6/content/wc.js
trunk/morphixlivekiosk/iceweasel-webconverger-6/content/wc.xul
trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/changelog
trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.install
Added Paths:
-----------
trunk/morphixlivekiosk/iceweasel-webconverger-6/content/wc.css
trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/
trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/preferences/
trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/preferences/prefs.js
Modified: trunk/morphixlivekiosk/iceweasel-webconverger-6/chrome.manifest
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/chrome.manifest 2007-06-20 18:36:06 UTC (rev 2522)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/chrome.manifest 2007-06-20 20:43:23 UTC (rev 2523)
@@ -1,2 +1,3 @@
content webconverger content/
overlay chrome://browser/content/browser.xul chrome://webconverger/content/wc.xul
+style chrome://browser/content/browser.xul chrome://webconverger/content/wc.css
Added: trunk/morphixlivekiosk/iceweasel-webconverger-6/content/wc.css
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/content/wc.css (rev 0)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/content/wc.css 2007-06-20 20:43:23 UTC (rev 2523)
@@ -0,0 +1,45 @@
+/*
+ * Edit this file and copy it as userChrome.css into your
+ * profile-directory/chrome/
+ */
+
+/*
+ * Webconverger.com
+ */
+
+/*
+ * Do not remove the @namespace line -- it's required for correct functioning
+ */
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to XUL */
+
+
+/*
+ #PersonalToolbar {
+ display: none;
+ }
+
+ #toolbar-menubar {
+ display: none;
+ }
+*/
+
+ #go-button-stack, .search-go-button-stack {
+display: none !important;}
+
+ #throbber-box {
+ display: none !important;
+ }
+
+
+#content > tabbox > .tabbrowser-strip > menupopup[anonid="tabContextMenu"] { display: none !important; }
+
+
+/* http://userstyles.org/styles/43 Thanks LouCypher */
+menuitem[disabled="true"] { display: none; }
+
+menuitem[disabled="true"],
+menuitem[disabled="true"] + menuseparator {
+display: none;
+}
+
+#context-sendpage, #context-savepage, #context-bookmarkpage, #PersonalToolbar, #toolbar-menubar { display: none; }
Modified: trunk/morphixlivekiosk/iceweasel-webconverger-6/content/wc.js
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/content/wc.js 2007-06-20 18:36:06 UTC (rev 2522)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/content/wc.js 2007-06-20 20:43:23 UTC (rev 2523)
@@ -18,289 +18,12 @@
function RkioskBrowserStartup()
{
- gBrowser = document.getElementById("content");
-
- window.tryToClose = WindowIsClosing;
-
Rkiosk_navbar_setting();
- var uriToLoad = null;
- // Check for window.arguments[0]. If present, use that for uriToLoad.
- if ("arguments" in window && window.arguments[0])
- uriToLoad = window.arguments[0];
-
- gIsLoadingBlank = uriToLoad == "about:blank";
-
- if (!gIsLoadingBlank)
- prepareForStartup();
-
-//@line 775 "/cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-release/WINNT_5.2_Depend/mozilla/browser/base/content/browser.js"
- if (uriToLoad && !gIsLoadingBlank) {
- if (window.arguments.length >= 3)
- loadURI(uriToLoad, window.arguments[2], window.arguments[3] || null,
- window.arguments[4] || false);
-
- else
- loadOneOrMoreURIs(uriToLoad);
- }
-//@line 784 "/cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-release/WINNT_5.2_Depend/mozilla/browser/base/content/browser.js"
-
- var sidebarSplitter;
- if (window.opener && !window.opener.closed) {
- if (window.opener.gFindBar && window.opener.gFindBar.mFindMode == FIND_NORMAL) {
- var openerFindBar = window.opener.document.getElementById("FindToolbar");
- if (openerFindBar && !openerFindBar.hidden)
- gFindBar.openFindBar();
- }
-
- var openerSidebarBox = window.opener.document.getElementById("sidebar-box");
- // The opener can be the hidden window too, if we're coming from the state
- // where no windows are open, and the hidden window has no sidebar box.
- if (openerSidebarBox && !openerSidebarBox.hidden) {
- var sidebarBox = document.getElementById("sidebar-box");
- var sidebarTitle = document.getElementById("sidebar-title");
- sidebarTitle.setAttribute("value", window.opener.document.getElementById("sidebar-title").getAttribute("value"));
- sidebarBox.setAttribute("width", openerSidebarBox.boxObject.width);
- var sidebarCmd = openerSidebarBox.getAttribute("sidebarcommand");
- sidebarBox.setAttribute("sidebarcommand", sidebarCmd);
- sidebarBox.setAttribute("src", window.opener.document.getElementById("sidebar").getAttribute("src"));
- gMustLoadSidebar = true;
- sidebarBox.hidden = false;
- sidebarSplitter = document.getElementById("sidebar-splitter");
- sidebarSplitter.hidden = false;
- document.getElementById(sidebarCmd).setAttribute("checked", "true");
- }
- }
- else {
- var box = document.getElementById("sidebar-box");
- if (box.hasAttribute("sidebarcommand")) {
- var commandID = box.getAttribute("sidebarcommand");
- if (commandID) {
- var command = document.getElementById(commandID);
- if (command) {
- gMustLoadSidebar = true;
- box.hidden = false;
- sidebarSplitter = document.getElementById("sidebar-splitter");
- sidebarSplitter.hidden = false;
- command.setAttribute("checked", "true");
- }
- else {
- // Remove the |sidebarcommand| attribute, because the element it
- // refers to no longer exists, so we should assume this sidebar
- // panel has been uninstalled. (249883)
- box.removeAttribute("sidebarcommand");
- }
- }
- }
- }
-
- // Certain kinds of automigration rely on this notification to complete their
- // tasks BEFORE the browser window is shown.
- var obs = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
- obs.notifyObservers(null, "browser-window-before-show", "");
-
- // Set a sane starting width/height for all resolutions on new profiles.
- if (!document.documentElement.hasAttribute("width")) {
- var defaultWidth = 994, defaultHeight;
- if (screen.availHeight <= 600) {
- document.documentElement.setAttribute("sizemode", "maximized");
- defaultWidth = 610;
- defaultHeight = 450;
- }
- else {
- // Create a narrower window for large or wide-aspect displays, to suggest
- // side-by-side page view.
- if ((screen.availWidth / 2) >= 800)
- defaultWidth = (screen.availWidth / 2) - 20;
- defaultHeight = screen.availHeight - 10;
-//@line 868 "/cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-release/WINNT_5.2_Depend/mozilla/browser/base/content/browser.js"
- }
- document.documentElement.setAttribute("width", defaultWidth);
- document.documentElement.setAttribute("height", defaultHeight);
- }
-
- setTimeout(RkioskdelayedStartup, 0);
+ BrowserStartup();
+ setTimeout(RkioskdelayedStartup, 1000);
}
function RkioskdelayedStartup()
{
- var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
- os.addObserver(gSessionHistoryObserver, "browser:purge-session-history", false);
- os.addObserver(gXPInstallObserver, "xpinstall-install-blocked", false);
-
- if (!gPrefService)
- gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefBranch);
- BrowserOffline.init();
-
- if (gURLBar && document.documentElement.getAttribute("chromehidden").indexOf("toolbar") != -1) {
- gURLBar.setAttribute("readonly", "true");
- gURLBar.setAttribute("enablehistory", "false");
- }
-
- if (gIsLoadingBlank)
- prepareForStartup();
-
- if (gURLBar)
- gURLBar.addEventListener("dragdrop", URLBarOnDrop, true);
-
- gBrowser.addEventListener("pageshow", function(evt) { setTimeout(pageShowEventHandlers, 0, evt); }, true);
-
- window.addEventListener("keypress", ctrlNumberTabSelection, false);
-
- if (gMustLoadSidebar) {
- var sidebar = document.getElementById("sidebar");
- var sidebarBox = document.getElementById("sidebar-box");
- sidebar.setAttribute("src", sidebarBox.getAttribute("src"));
- }
-
- gFindBar.initFindBar();
-
-//@line 991 "/cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-release/WINNT_5.2_Depend/mozilla/browser/base/content/browser.js"
- // add bookmark options to context menu for tabs
- addBookmarkMenuitems();
- initServices();
- initBMService();
- // now load bookmarks
- BMSVC.readBookmarks();
- var bt = document.getElementById("bookmarks-ptf");
- if (bt) {
- var btf = BMSVC.getBookmarksToolbarFolder().Value;
- bt.ref = btf;
- document.getElementById("bookmarks-chevron").ref = btf;
- bt.database.AddObserver(BookmarksToolbarRDFObserver);
- }
- window.addEventListener("resize", BookmarksToolbar.resizeFunc, false);
- document.getElementById("PersonalToolbar")
- .controllers.appendController(BookmarksMenuController);
-//@line 1015 "/cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-release/WINNT_5.2_Depend/mozilla/browser/base/content/browser.js"
-
- // called when we go into full screen, even if it is
- // initiated by a web page script
- window.addEventListener("fullscreen", onFullScreen, true);
-
- var element;
- if (gIsLoadingBlank && gURLBar && !gURLBar.hidden &&
- !gURLBarContainer.parentNode.collapsed)
- element = gURLBar;
- else
- element = content;
-
- // This is a redo of the fix for jag bug 91884
- var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
- .getService(Components.interfaces.nsIWindowWatcher);
- if (window == ww.activeWindow) {
- element.focus();
- } else {
- // set the element in command dispatcher so focus will restore properly
- // when the window does become active
- if (element instanceof Components.interfaces.nsIDOMWindow) {
- document.commandDispatcher.focusedWindow = element;
- document.commandDispatcher.focusedElement = null;
- } else if (element instanceof Components.interfaces.nsIDOMElement) {
- document.commandDispatcher.focusedWindow = element.ownerDocument.defaultView;
- document.commandDispatcher.focusedElement = element;
- }
- }
-
- SetPageProxyState("invalid");
-
- var toolbox = document.getElementById("navigator-toolbox");
- toolbox.customizeDone = BrowserToolboxCustomizeDone;
-
- // Set up Sanitize Item
- gSanitizeListener = new SanitizeListener();
-
- var pbi = gPrefService.QueryInterface(Components.interfaces.nsIPrefBranchInternal);
-
- // Enable/Disable Form Fill
- gFormFillPrefListener = new FormFillPrefListener();
- pbi.addObserver(gFormFillPrefListener.domain, gFormFillPrefListener, false);
- gFormFillPrefListener.toggleFormFill();
-
- // Enable/Disable URL Bar Auto Fill
- gURLBarAutoFillPrefListener = new URLBarAutoFillPrefListener();
- pbi.addObserver(gURLBarAutoFillPrefListener.domain, gURLBarAutoFillPrefListener, false);
-
- // Enable/Disable auto-hide tabbar
- gAutoHideTabbarPrefListener = new AutoHideTabbarPrefListener();
- pbi.addObserver(gAutoHideTabbarPrefListener.domain, gAutoHideTabbarPrefListener, false);
-
- // Enable/Disable Go button
- gGoButtonPrefListener = new GoButtonPrefListener();
- pbi.addObserver(gGoButtonPrefListener.domain, gGoButtonPrefListener, false);
-
- pbi.addObserver(gHomeButton.prefDomain, gHomeButton, false);
- gHomeButton.updateTooltip();
-
- gClickSelectsAll = gPrefService.getBoolPref("browser.urlbar.clickSelectsAll");
- if (gURLBar)
- gURLBar.clickSelectsAll = gClickSelectsAll;
-
-//@line 1079 "/cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-release/WINNT_5.2_Depend/mozilla/browser/base/content/browser.js"
- // Perform default browser checking (after window opens).
- var shell = getShellService();
- if (shell) {
- var shouldCheck = shell.shouldCheckDefaultBrowser;
- var willRestoreSession = false;
- try {
- var ss = Cc["@mozilla.org/browser/sessionstartup;1"].
- getService(Ci.nsISessionStartup);
- willRestoreSession = ss.doRestore();
- }
- catch (ex) { /* never mind; suppose SessionStore is broken */ }
- if (shouldCheck && !shell.isDefaultBrowser(true) && !willRestoreSession) {
- var brandBundle = document.getElementById("bundle_brand");
- var shellBundle = document.getElementById("bundle_shell");
-
- var brandShortName = brandBundle.getString("brandShortName");
- var promptTitle = shellBundle.getString("setDefaultBrowserTitle");
- var promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage",
- [brandShortName]);
- var checkboxLabel = shellBundle.getFormattedString("setDefaultBrowserDontAsk",
- [brandShortName]);
- const IPS = Components.interfaces.nsIPromptService;
- var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
- .getService(IPS);
- var checkEveryTime = { value: shouldCheck };
- var rv = ps.confirmEx(window, promptTitle, promptMessage,
- (IPS.BUTTON_TITLE_YES * IPS.BUTTON_POS_0) +
- (IPS.BUTTON_TITLE_NO * IPS.BUTTON_POS_1),
- null, null, null, checkboxLabel, checkEveryTime);
- if (rv == 0)
- shell.setDefaultBrowser(true, false);
- shell.shouldCheckDefaultBrowser = checkEveryTime.value;
- }
- }
-//@line 1114 "/cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-release/WINNT_5.2_Depend/mozilla/browser/base/content/browser.js"
-
- // BiDi UI
- gBidiUI = isBidiEnabled();
- if (gBidiUI) {
- document.getElementById("documentDirection-separator").hidden = false;
- document.getElementById("documentDirection-swap").hidden = false;
- document.getElementById("textfieldDirection-separator").hidden = false;
- document.getElementById("textfieldDirection-swap").hidden = false;
- }
-
-//@line 1130 "/cygdrive/c/builds/tinderbox/Fx-Mozilla1.8-release/WINNT_5.2_Depend/mozilla/browser/base/content/browser.js"
-
- // Initialize the microsummary service by retrieving it, prompting its factory
- // to create its singleton, whose constructor initializes the service.
- Cc["@mozilla.org/microsummary/service;1"].getService(Ci.nsIMicrosummaryService);
-
- // initialize the session-restore service (in case it's not already running)
- if (document.documentElement.getAttribute("windowtype") == "navigator:browser") {
- try {
- var ss = Cc["@mozilla.org/browser/sessionstore;1"].
- getService(Ci.nsISessionStore);
- ss.init(window);
- } catch(ex) {
- dump("nsSessionStore could not be initialized: " + ex + "\n");
- }
- }
- BrowserFullScreen();
-
- // browser-specific tab augmentation
- AugmentTabs.init();
+// window.fullScreen = true;
}
-
Modified: trunk/morphixlivekiosk/iceweasel-webconverger-6/content/wc.xul
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/content/wc.xul 2007-06-20 18:36:06 UTC (rev 2522)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/content/wc.xul 2007-06-20 20:43:23 UTC (rev 2523)
@@ -12,16 +12,18 @@
<menuitem id="menu_preferences" disabled="true"/>
</menubar>
+<!--
<popup id="contentAreaContextMenu"
onpopupshowing="if (event.target != this) return true; return false;"
onpopuphiding="if (event.target == this) gContextMenu = null;">
</popup>
+-->
<commandset id="mainCommandSet">
<command id="cmd_newNavigator" disabled="true"/>
- <command id="cmd_bm_open" disabled="true"/>
+ <command id="cmd_bm_open" disabled="false"/>
<command id="cmd_bm_openinnewwindow" disabled="true"/>
- <command id="cmd_bm_openinnewtab" disabled="true"/>
+ <command id="cmd_bm_openinnewtab" disabled="false"/>
<command id="cmd_bm_openfolder" disabled="true"/>
<command id="cmd_bm_managefolder" disabled="true"/>
<command id="cmd_bm_newfolder" disabled="true"/>
@@ -35,7 +37,7 @@
<command id="cmd_bm_sortbyname" disabled="true"/>
<command id="cmd_handleBackspace" disabled="true"/>
<command id="cmd_handleShiftBackspace" disabled="true"/>
- <command id="cmd_newNavigatorTab" disabled="true"/>
+ <command id="cmd_newNavigatorTab" disabled="false"/>
<command id="Browser:OpenFile" disabled="true"/>
<command id="Browser:SavePage" disabled="true"/>
<command id="Browser:SaveFrame" disabled="true"/>
@@ -43,24 +45,24 @@
<command id="cmd_pageSetup" disabled="true"/>
<command id="cmd_print" oncommand="PrintUtils.print();"/>
<command id="cmd_printPreview" disabled="true"/>
- <command id="cmd_close" disabled="true"/>
- <command id="cmd_closeWindow" disabled="true"/>
+ <command id="cmd_close" disabled="false"/>
+ <command id="cmd_closeWindow" disabled="false"/>
<command id="cmd_toggleTaskbar" disabled="true"/>
<command id="cmd_CustomizeToolbars" disabled="true"/>
<command id="cmd_copyLink" disabled="true"/>
<command id="cmd_copyImageLocation" disabled="true"/>
<command id="cmd_copyImageContents" disabled="true"/>
- <command id="cmd_undo" disabled="true"/>
- <command id="cmd_redo" disabled="true"/>
- <command id="cmd_cut" disabled="true"/>
- <command id="cmd_copy" disabled="true"/>
- <command id="cmd_paste" disabled="true"/>
- <command id="cmd_delete" disabled="true"/>
+ <command id="cmd_undo" disabled="false"/>
+ <command id="cmd_redo" disabled="false"/>
+ <command id="cmd_cut" disabled="false"/>
+ <command id="cmd_copy" disabled="false"/>
+ <command id="cmd_paste" disabled="false"/>
+ <command id="cmd_delete" disabled="false"/>
<command id="cmd_selectAll" disabled="true"/>
- <command id="cmd_switchTextDirection" disabled="true"/>
+ <command id="cmd_switchTextDirection" disabled="false"/>
<command id="View:PageSource" disabled="true"/>
<command id="View:PageInfo" disabled="true"/>
- <command id="View:FullScreen" disabled="true"/>
+ <command id="View:FullScreen" disabled="false"/>
<command id="cmd_find" disabled="true"/>
<command id="cmd_findAgain" disabled="true"/>
<command id="cmd_findPrevious" disabled="true"/>
@@ -72,11 +74,11 @@
<command id="Browser:Stop" disabled="true"/>
<command id="Browser:Reload" disabled="true"/>
<command id="Browser:ReloadSkipCache" disabled="true"/>
- <command id="cmd_textZoomReduce" disabled="true"/>
- <command id="cmd_textZoomEnlarge" disabled="true"/>
- <command id="cmd_textZoomReset" disabled="true"/>
- <command id="Browser:OpenLocation" disabled="true"/>
- <command id="Tools:Search" disabled="true"/>
+ <command id="cmd_textZoomReduce" disabled="false"/>
+ <command id="cmd_textZoomEnlarge" disabled="false"/>
+ <command id="cmd_textZoomReset" disabled="false"/>
+ <command id="Browser:OpenLocation" disabled="false"/>
+ <command id="Tools:Search" disabled="false"/>
<command id="Tools:Downloads" disabled="true"/>
<command id="Tools:Addons" disabled="true"/>
<command id="Tools:Sanitize" disabled="true"/>
@@ -86,17 +88,17 @@
<keyset id="mainKeyset">
<key id="rkiosk_f1" keycode="VK_F1" oncommand="Rkiosk_donothing();"/>
<key id="key_newNavigator" disabled="true"/>
- <key id="key_newNavigatorTab" disabled="true"/>
- <key id="focusURLBar" disabled="true"/>
- <key id="focusURLBar2" disabled="true"/>
- <key id="key_search" disabled="true"/>
- <key id="key_search2" disabled="true"/>
+ <key id="key_newNavigatorTab" disabled="false"/>
+ <key id="focusURLBar" disabled="false"/>
+ <key id="focusURLBar2" disabled="false"/>
+ <key id="key_search" disabled="false"/>
+ <key id="key_search2" disabled="false"/>
<key id="key_openDownloads" disabled="true"/>
<key id="openFileKb" disabled="true"/>
<key id="key_savePage" disabled="true"/>
<key id="printKb" disabled="true"/>
- <key id="key_close" disabled="true"/>
- <key id="key_closeWindow" disabled="true"/>
+ <key id="key_close" disabled="false"/>
+ <key id="key_closeWindow" disabled="false"/>
<key id="key_undo" disabled="true"/>
<key id="key_redo" disabled="true"/>
<key id="key_cut" disabled="true"/>
@@ -107,7 +109,7 @@
<key id="goBackKb" disabled="true"/>
<key id="goForwardKb" disabled="true"/>
<key id="goHome" keycode="VK_HOME" command="Browser:Home" modifiers="alt"/>
- <key id="key_fullScreen" disabled="true"/>
+ <key id="key_fullScreen" disabled="false"/>
<key id="key_viewSource" disabled="true"/>
<key id="key_find" disabled="true"/>
<key id="key_findAgain" disabled="true"/>
@@ -120,7 +122,7 @@
<key id="key_textZoomReset" disabled="true"/>
<key id="key_switchTextDirection" disabled="true"/>
<key id="key_sanitize" disabled="true"/>
- <key id="key_undoCloseTab" disabled="true"/>
+ <key id="key_undoCloseTab" disabled="false"/>
<key id="key_gotoHistory" command="Rkiosk_donothing();"/>
<key id="viewBookmarksSidebarKb" command="Rkiosk_donothing();"/>
<key id="viewBookmarksSidebarWinKb" command="Rkiosk_donothing();"/>
Modified: trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/changelog
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/changelog 2007-06-20 18:36:06 UTC (rev 2522)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/changelog 2007-06-20 20:43:23 UTC (rev 2523)
@@ -1,3 +1,9 @@
+iceweasel-webconverger-morphixlivekiosk (6-16) unstable; urgency=low
+
+ * Updating to match upstream package.
+
+ -- Brendan Sleight <bms...@ba...> Wed, 20 Jun 2007 21:30:00 +0100
+
iceweasel-webconverger-morphixlivekiosk (6-3) unstable; urgency=low
* Changed Packages names in case morphix and weconverger repositories are present
Modified: trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.install
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.install 2007-06-20 18:36:06 UTC (rev 2522)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/debian/iceweasel-webconverger.install 2007-06-20 20:43:23 UTC (rev 2523)
@@ -1 +1 @@
-chrome.manifest install.rdf content usr/share/iceweasel-extensions/webconverger/
+chrome.manifest defaults install.rdf content usr/share/iceweasel-extensions/webconverger/
Added: trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/preferences/prefs.js
===================================================================
--- trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/preferences/prefs.js (rev 0)
+++ trunk/morphixlivekiosk/iceweasel-webconverger-6/defaults/preferences/prefs.js 2007-06-20 20:43:23 UTC (rev 2523)
@@ -0,0 +1,59 @@
+/* Webconverger.com
+*/
+
+pref("browser.startup.homepage", "http://portal.webconverger.com");
+pref("accessibility.typeaheadfind.flashBar", 0);
+pref("app.update.enabled", false);
+pref("browser.download.dir", "/tmp");
+pref("browser.download.downloadDir", "/tmp");
+pref("browser.download.folderList", 2);
+pref("browser.download.lastDir", "/tmp");
+pref("browser.history_expire_days.mirror", 1);
+pref("browser.preferences.advanced.selectedTabIndex", 2);
+pref("browser.startup.homepage_override.mstone", "rv:1.8.1.3");
+pref("browser.startup.page", 3);
+pref("browser.tabs.autoHide", false);
+pref("browser.tabs.closeButtons", 3);
+pref("browser.tabs.tabMinWidth", 0);
+pref("browser.tabs.warnOnOpen", false);
+pref("browser.urlbar.hideGoButton", true);
+pref("network.cookie.prefsMigrated", true);
+pref("pref.advanced.javascript.disable_button.advanced", false);
+pref("pref.privacy.disable_button.view_cookies", false);
+pref("security.warn_entering_secure", false);
+pref("security.warn_leaving_secure", false);
+pref("security.warn_submit_insecure", false);
+pref("signon.rememberSignons", false);
+
+
+// This is the Webconverger specific preferences file for Iceweasel
+// You can make any change in here, it is the purpose of this file.
+// You can, with this file and all files present in the
+// /etc/iceweasel/pref directory, override any preference that is
+// present in /usr/lib/iceweasel/defaults/pref directory.
+// While your changes will be kept on upgrade if you modify files in
+// /etc/iceweasel/pref, please note that they won't be kept if you
+// do them in /usr/lib/iceweasel/defaults/pref.
+
+// Update via APT
+pref("extensions.update.enabled", false);
+
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
+
+// Make sure new windows open in a tab
+pref("browser.link.open_newwindow", 3);
+pref("browser.link.open_external",3);
+pref("browser.link.open_newwindow.restriction", 0);
+
+// COMMENT OUT to disable print dialog
+// pref("print.always_print_silent",true);
+// pref("print.show_print_progress",false);
+
+pref("rkiosk.navbar", true);
+
+// BETA Spell check all fields
+pref("layout.spellcheck.default", 2)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-06-20 18:36:18
|
Revision: 2522
http://svn.sourceforge.net/morphix/?rev=2522&view=rev
Author: bmsleight
Date: 2007-06-20 11:36:06 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Adding morphix-chroot to morphing-tools
Modified Paths:
--------------
trunk/morph-scripts/debian/changelog
trunk/morph-scripts/debian/control
Modified: trunk/morph-scripts/debian/changelog
===================================================================
--- trunk/morph-scripts/debian/changelog 2007-06-18 21:11:23 UTC (rev 2521)
+++ trunk/morph-scripts/debian/changelog 2007-06-20 18:36:06 UTC (rev 2522)
@@ -1,3 +1,9 @@
+morph-scripts (0.2-34) unstable; urgency=low
+
+ * Adding morphix-chroot to morphing-tools
+
+ -- bmsleight <bms...@ba...> Wed, 20 Jun 2007 19:30:00 +0100
+
morph-scripts (0.2-33) unstable; urgency=low
* Tweak depends and change Section: to utils so that reprepro will
Modified: trunk/morph-scripts/debian/control
===================================================================
--- trunk/morph-scripts/debian/control 2007-06-18 21:11:23 UTC (rev 2521)
+++ trunk/morph-scripts/debian/control 2007-06-20 18:36:06 UTC (rev 2522)
@@ -8,7 +8,7 @@
Package: morphing-tools
Provides: morphix-tools, morph-scripts
Architecture: any
-Depends: morphix-moduleloader, morphix-isomorph, morphix-install2mainmod, morphix-changekernel, morphix-make-iso, morphix-modulebuilder, morphix-moduleextractor, morphix-minimodgen, morphix-deb-get, morphix-addtoiso, morphix-converttobootimg, morphix-buildminimod, morphix-mmaker, morphix-morphmini, morphix-rebrand
+Depends: morphix-moduleloader, morphix-isomorph, morphix-install2mainmod, morphix-changekernel, morphix-make-iso, morphix-modulebuilder, morphix-moduleextractor, morphix-minimodgen, morphix-deb-get, morphix-addtoiso, morphix-converttobootimg, morphix-buildminimod, morphix-mmaker, morphix-morphmini, morphix-rebrand, morphix-chroot
Description: Metapackage for all Morphix commandline tools
Metapackage for all Morphix commandline tools that handle modules.
See separate packages for descriptions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-06-18 21:11:24
|
Revision: 2521
http://svn.sourceforge.net/morphix/?rev=2521&view=rev
Author: bmsleight
Date: 2007-06-18 14:11:23 -0700 (Mon, 18 Jun 2007)
Log Message:
-----------
Adding Locking file
Modified Paths:
--------------
trunk/mmaker/utils/auto-testing/run_testing.sh
Modified: trunk/mmaker/utils/auto-testing/run_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/run_testing.sh 2007-06-18 20:05:44 UTC (rev 2520)
+++ trunk/mmaker/utils/auto-testing/run_testing.sh 2007-06-18 21:11:23 UTC (rev 2521)
@@ -19,6 +19,15 @@
# 5 - Convert screenshots to video
# 6 - rsync video
# 7 - Relax until the next day
+if [ -f /tmp/AutoTesting.lock ]
+then
+ echo "Already running AutoTesting"
+ exit
+fi
+
+echo "Lock File" >/tmp/AutoTesting.lock
+
+
SKIP_DOWNLOADS="$1"
TODAY=$(date +"%F")
@@ -58,6 +67,7 @@
if [ -z "$SKIP_DOWNLOADS" ]; then
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/base/*$TODAY* /home/morph/autobuilds/base/
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sid/*$TODAY* /home/morph/autobuilds/mainmod/sid/
+ rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/etch/*$TODAY* /home/morph/autobuilds/mainmod/etch/
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sarge/*$TODAY* /home/morph/autobuilds/mainmod/sarge/
rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/minimod/*$TODAY* /home/morph/autobuilds/minimod/
@@ -205,3 +215,4 @@
rsync -avz --delete -e ssh $VID_DIR mo...@lo...:morphixorg/autobuilds/video/
rm $TMP_TAR_DIR/*
sudo rm $TMP_ISO_DIR -r
+rm /tmp/AutoTesting.lock
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-06-18 20:05:46
|
Revision: 2520
http://svn.sourceforge.net/morphix/?rev=2520&view=rev
Author: bmsleight
Date: 2007-06-18 13:05:44 -0700 (Mon, 18 Jun 2007)
Log Message:
-----------
Making AutoTesting script more ugly
Modified Paths:
--------------
trunk/mmaker/utils/auto-testing/auto_testing.sh
Modified: trunk/mmaker/utils/auto-testing/auto_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/auto_testing.sh 2007-06-03 00:18:05 UTC (rev 2519)
+++ trunk/mmaker/utils/auto-testing/auto_testing.sh 2007-06-18 20:05:44 UTC (rev 2520)
@@ -40,7 +40,10 @@
LIST_ISOMORPH=$(echo ; isomorph --list $ISO )
isomorph --add boot "splash=n debugmorphix=yes" $ISO $TMP_D/qemu.iso
-qemu -no-kqemu -full-screen -pidfile $TMP_D/qemu.pid -cdrom $TMP_D/qemu.iso &
+qemu -vnc :1 -no-kqemu -full-screen -pidfile $TMP_D/qemu.pid -cdrom $TMP_D/qemu.iso &
+sleep 2
+vncviewer -encodings raw -fullscreen -viewonly 127.0.0.1:1 &
+#vncviewer -fullscreen -viewonly 127.0.0.1:1 &
l=16
#xwininfo -root | grep wininfo | cut -d' ' -f 4 >$TMP_D/xwid
@@ -53,10 +56,16 @@
elif [ "$l" -lt "100" ]
then
convert=$DUMPS'0'$l'.miff'
+ if [ "$l" -eq "22" ]
+ then
+ echo "hi"
+ killall vncviewer
+ vncviewer -encodings raw -fullscreen -viewonly 127.0.0.1:1 &
+ fi
else
convert=$DUMPS$l'.miff'
fi
- import -window root $convert
+ import -display :0 -window root $convert
# sleep 0.5
l=$(expr $l + 1)
echo "Frame " $convert " at " $(date +"%F_%H:%M:%S.%N")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2007-06-03 00:18:07
|
Revision: 2519
http://svn.sourceforge.net/morphix/?rev=2519&view=rev
Author: paul_c
Date: 2007-06-02 17:18:05 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
icepref no longer in stable/testing/unstable
Modified Paths:
--------------
trunk/mmaker/templates/morphing-morphix.xml
trunk/mmaker/templates/morphix-game.xml
trunk/mmaker/templates/morphix-icewm.xml
Modified: trunk/mmaker/templates/morphing-morphix.xml
===================================================================
--- trunk/mmaker/templates/morphing-morphix.xml 2007-06-03 00:09:47 UTC (rev 2518)
+++ trunk/mmaker/templates/morphing-morphix.xml 2007-06-03 00:18:05 UTC (rev 2519)
@@ -27,7 +27,6 @@
<packagereq>hdparm</packagereq>
<packagereq>hotplug</packagereq>
<packagereq>icewm-themes</packagereq>
-<packagereq>icepref</packagereq>
<packagereq>iceconf</packagereq>
<packagereq>imagemagick</packagereq>
<packagereq>less</packagereq>
Modified: trunk/mmaker/templates/morphix-game.xml
===================================================================
--- trunk/mmaker/templates/morphix-game.xml 2007-06-03 00:09:47 UTC (rev 2518)
+++ trunk/mmaker/templates/morphix-game.xml 2007-06-03 00:18:05 UTC (rev 2519)
@@ -29,7 +29,6 @@
<packagereq>hdparm</packagereq>
<packagereq>hotplug</packagereq>
<packagereq>icewm-themes</packagereq>
-<packagereq>icepref</packagereq>
<packagereq>iceconf</packagereq>
<packagereq>less</packagereq>
<packagereq>locales</packagereq>
Modified: trunk/mmaker/templates/morphix-icewm.xml
===================================================================
--- trunk/mmaker/templates/morphix-icewm.xml 2007-06-03 00:09:47 UTC (rev 2518)
+++ trunk/mmaker/templates/morphix-icewm.xml 2007-06-03 00:18:05 UTC (rev 2519)
@@ -39,7 +39,6 @@
<packagereq>hdparm</packagereq>
<packagereq>hotplug</packagereq>
<packagereq>icewm-themes</packagereq>
-<packagereq>icepref</packagereq>
<packagereq>iceconf</packagereq>
<packagereq>less</packagereq>
<packagereq>locales</packagereq>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2007-06-03 00:09:48
|
Revision: 2518
http://svn.sourceforge.net/morphix/?rev=2518&view=rev
Author: alextreme
Date: 2007-06-02 17:09:47 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
* bumping, etch version uploaded
Modified Paths:
--------------
trunk/mcp/debian/changelog
Modified: trunk/mcp/debian/changelog
===================================================================
--- trunk/mcp/debian/changelog 2007-06-01 13:53:38 UTC (rev 2517)
+++ trunk/mcp/debian/changelog 2007-06-03 00:09:47 UTC (rev 2518)
@@ -1,3 +1,15 @@
+mcp (0.3-6) unstable; urgency=low
+
+ * building against etch
+
+ -- root <ro...@al...> Sun, 3 Jun 2007 02:02:04 +0200
+
+mcp (0.3-5) unstable; urgency=low
+
+ * not depending on xconf until dependancy-issues have been resolved
+
+ -- root <ro...@al...> Fri, 1 Jun 2007 15:47:00 +0200
+
mcp (0.3-4) unstable; urgency=low
* fix for new mcp/mcp-bin differences
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2007-06-01 13:53:42
|
Revision: 2517
http://svn.sourceforge.net/morphix/?rev=2517&view=rev
Author: paul_c
Date: 2007-06-01 06:53:38 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Add string.h to the includes.
Modified Paths:
--------------
trunk/mcp/src/dirtree.c
Removed Paths:
-------------
trunk/mcp/src/eggiconlist.c~
Modified: trunk/mcp/src/dirtree.c
===================================================================
--- trunk/mcp/src/dirtree.c 2007-06-01 13:50:52 UTC (rev 2516)
+++ trunk/mcp/src/dirtree.c 2007-06-01 13:53:38 UTC (rev 2517)
@@ -3,7 +3,7 @@
#endif
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtk.h>
-
+#include <string.h>
#include "dirtree.h"
#include "desktop_file.h"
#include "iconviewer.h"
Deleted: trunk/mcp/src/eggiconlist.c~
===================================================================
--- trunk/mcp/src/eggiconlist.c~ 2007-06-01 13:50:52 UTC (rev 2516)
+++ trunk/mcp/src/eggiconlist.c~ 2007-06-01 13:53:38 UTC (rev 2517)
@@ -1,2452 +0,0 @@
-/* eggiconlist.h
- * Copyright (C) 2002 Anders Carlsson <and...@gn...>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "eggiconlist.h"
-
-#include <string.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-
-#include "eggintl.h"
-#include "eggmarshalers.h"
-
-
-#define MINIMUM_ICON_ITEM_WIDTH 100
-#define ICON_TEXT_PADDING 3
-
-#define ICON_LIST_ITEM_DATA "egg-icon-list-item-data"
-
-struct _EggIconListItem
-{
- gint ref_count;
-
- EggIconList *icon_list;
- char *label;
- GdkPixbuf *icon;
-
- GList *list;
-
- gpointer user_data;
- GDestroyNotify destroy_notify;
-
- /* Bounding boxes */
- gint x, y;
- gint width, height;
-
- gint pixbuf_x, pixbuf_y;
- gint pixbuf_height, pixbuf_width;
-
- gint layout_x, layout_y;
- gint layout_width, layout_height;
-
- guint selected : 1;
- guint selected_before_rubberbanding : 1;
-};
-
-struct _EggIconListPrivate
-{
- gint width, height;
-
- GtkSelectionMode selection_mode;
-
- GdkWindow *bin_window;
-
- GList *items;
- GList *last_item;
- gint item_count;
-
- GtkAdjustment *hadjustment;
- GtkAdjustment *vadjustment;
-
- guint layout_idle_id;
-
- gboolean rubberbanding;
- gint rubberband_x1, rubberband_y1;
- gint rubberband_x2, rubberband_y2;
-
- EggIconListItem *cursor_item;
-
- char *typeahead_string;
-
- /* Sorting */
- gboolean sorted;
- GtkSortType sort_order;
-
- EggIconListItemCompareFunc sort_func;
- gpointer sort_data;
- GDestroyNotify sort_destroy_notify;
-
- EggIconListItem *last_single_clicked;
-
- /* Drag-and-drop. */
- gint pressed_button;
- gint press_start_x;
- gint press_start_y;
-
- /* Layout used to draw icon text */
- PangoLayout *layout;
-};
-
-/* Signals */
-enum
-{
- ITEM_ACTIVATED,
- ITEM_ADDED,
- ITEM_REMOVED,
- SELECTION_CHANGED,
- SELECT_ALL,
- UNSELECT_ALL,
- SELECT_CURSOR_ITEM,
- TOGGLE_CURSOR_ITEM,
- MOVE_CURSOR,
- LAST_SIGNAL
-};
-
-/* Properties */
-enum
-{
- PROP_0,
- PROP_SELECTION_MODE,
- PROP_SORTED,
- PROP_SORT_ORDER,
-};
-
-/* Icon List Item properties */
-enum
-{
- PROP_ITEM_0,
- PROP_LABEL,
-};
-
-static void egg_icon_list_class_init (EggIconListClass *klass);
-static void egg_icon_list_init (EggIconList *icon_list);
-
-/* GObject signals */
-static void egg_icon_list_finalize (GObject *object);
-static void egg_icon_list_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void egg_icon_list_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-
-
-/* GtkWidget signals */
-static void egg_icon_list_realize (GtkWidget *widget);
-static void egg_icon_list_unrealize (GtkWidget *widget);
-static void egg_icon_list_map (GtkWidget *widget);
-static void egg_icon_list_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void egg_icon_list_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static gboolean egg_icon_list_expose (GtkWidget *widget,
- GdkEventExpose *expose);
-static gboolean egg_icon_list_motion (GtkWidget *widget,
- GdkEventMotion *event);
-static gboolean egg_icon_list_button_press (GtkWidget *widget,
- GdkEventButton *event);
-static gboolean egg_icon_list_button_release (GtkWidget *widget,
- GdkEventButton *event);
-static gboolean egg_icon_list_key_press (GtkWidget *widget,
- GdkEventKey *event);
-
-
-/* EggIconList signals */
-static void egg_icon_list_set_adjustments (EggIconList *icon_list,
- GtkAdjustment *hadj,
- GtkAdjustment *vadj);
-static void egg_icon_list_real_select_all (EggIconList *icon_list);
-static void egg_icon_list_real_unselect_all (EggIconList *icon_list);
-static void egg_icon_list_real_select_cursor_item (EggIconList *icon_list);
-static void egg_icon_list_real_toggle_cursor_item (EggIconList *icon_list);
-
-/* Internal functions */
-static void egg_icon_list_adjustment_changed (GtkAdjustment *adjustment,
- EggIconList *icon_list);
-static void egg_icon_list_layout (EggIconList *icon_list);
-static void egg_icon_list_paint_item (EggIconList *icon_list,
- EggIconListItem *item,
- GdkRectangle *area);
-static void egg_icon_list_paint_rubberband (EggIconList *icon_list,
- GdkRectangle *area);
-static void egg_icon_list_queue_draw_item (EggIconList *icon_list,
- EggIconListItem *item);
-static void egg_icon_list_queue_layout (EggIconList *icon_list);
-static void egg_icon_list_set_cursor_item (EggIconList *icon_list,
- EggIconListItem *item);
-static void egg_icon_list_append_typeahead_string (EggIconList *icon_list,
- const gchar *string);
-static void egg_icon_list_select_first_matching_item (EggIconList *icon_list,
- const char *pattern);
-static void egg_icon_list_start_rubberbanding (EggIconList *icon_list,
- gint x,
- gint y);
-static void egg_icon_list_stop_rubberbanding (EggIconList *icon_list);
-static void egg_icon_list_sort (EggIconList *icon_list);
-static gint egg_icon_list_sort_func (EggIconListItem *a,
- EggIconListItem *b,
- EggIconList *icon_list);
-static void egg_icon_list_insert_item_sorted (EggIconList *icon_list,
- EggIconListItem *item);
-static void egg_icon_list_validate (EggIconList *icon_list);
-static void egg_icon_list_update_rubberband_selection (EggIconList *icon_list);
-static gboolean egg_icon_list_item_hit_test (EggIconListItem *item,
- gint x,
- gint y,
- gint width,
- gint height);
-static gboolean egg_icon_list_maybe_begin_dragging_items (EggIconList *icon_list,
- GdkEventMotion *event);
-static gboolean egg_icon_list_unselect_all_internal (EggIconList *icon_list,
- gboolean emit);
-static void egg_icon_list_calculate_item_size (EggIconList *icon_list, EggIconListItem *item);
-static void rubberbanding (gpointer data);
-
-
-static void egg_icon_list_item_invalidate_size (EggIconListItem *item);
-
-static GtkContainerClass *parent_class = NULL;
-static guint icon_list_signals[LAST_SIGNAL] = { 0 };
-
-GType
-egg_icon_list_item_get_type (void)
-{
- static GType boxed_type = 0;
-
- if (!boxed_type)
- boxed_type = g_boxed_type_register_static ("EggIconListItem",
- (GBoxedCopyFunc) egg_icon_list_item_ref,
- (GBoxedFreeFunc) egg_icon_list_item_unref);
-
- return boxed_type;
-}
-
-GType
-egg_icon_list_get_type (void)
-{
- static GType object_type = 0;
-
- if (!object_type)
- {
- static const GTypeInfo object_info =
- {
- sizeof (EggIconListClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) egg_icon_list_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (EggIconList),
- 0, /* n_preallocs */
- (GInstanceInitFunc) egg_icon_list_init
- };
-
- object_type = g_type_register_static (GTK_TYPE_CONTAINER, "EggIconList", &object_info, 0);
- }
-
- return object_type;
-}
-
-static void
-egg_icon_list_class_init (EggIconListClass *klass)
-{
- GObjectClass *gobject_class;
- GtkWidgetClass *widget_class;
- GtkBindingSet *binding_set;
-
- parent_class = g_type_class_peek_parent (klass);
- binding_set = gtk_binding_set_by_class (klass);
-
- gobject_class = (GObjectClass *) klass;
- widget_class = (GtkWidgetClass *) klass;
-
- gobject_class->finalize = egg_icon_list_finalize;
- gobject_class->set_property = egg_icon_list_set_property;
- gobject_class->get_property = egg_icon_list_get_property;
-
- widget_class->realize = egg_icon_list_realize;
- widget_class->unrealize = egg_icon_list_unrealize;
- widget_class->map = egg_icon_list_map;
- widget_class->size_request = egg_icon_list_size_request;
- widget_class->size_allocate = egg_icon_list_size_allocate;
- widget_class->expose_event = egg_icon_list_expose;
- widget_class->motion_notify_event = egg_icon_list_motion;
- widget_class->button_press_event = egg_icon_list_button_press;
- widget_class->button_release_event = egg_icon_list_button_release;
- widget_class->key_press_event = egg_icon_list_key_press;
-
- klass->set_scroll_adjustments = egg_icon_list_set_adjustments;
- klass->select_all = egg_icon_list_real_select_all;
- klass->unselect_all = egg_icon_list_real_unselect_all;
- klass->select_cursor_item = egg_icon_list_real_select_cursor_item;
- klass->toggle_cursor_item = egg_icon_list_real_toggle_cursor_item;
-
- /* Properties */
- g_object_class_install_property (gobject_class,
- PROP_SELECTION_MODE,
- g_param_spec_enum ("selection_mode",
- _("Selection mode"),
- _("The selection mode"),
- GTK_TYPE_SELECTION_MODE,
- GTK_SELECTION_SINGLE,
- G_PARAM_READWRITE));
-
- g_object_class_install_property (gobject_class,
- PROP_SORTED,
- g_param_spec_boolean ("sorted",
- _("Sorted"),
- _("Icon list is sorted"),
- FALSE,
- G_PARAM_READWRITE));
- g_object_class_install_property (gobject_class,
- PROP_SORT_ORDER,
- g_param_spec_enum ("sort_order",
- _("Sort order"),
- _("Sort direction the icon list should use"),
- GTK_TYPE_SORT_TYPE,
- GTK_SORT_ASCENDING,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
-
- /* Style properties */
-#define _ICON_LIST_TOP_MARGIN 6
-#define _ICON_LIST_BOTTOM_MARGIN 6
-#define _ICON_LIST_LEFT_MARGIN 6
-#define _ICON_LIST_RIGHT_MARGIN 6
-#define _ICON_LIST_ICON_PADDING 6
-
- gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("icon_padding",
- _("Icon padding"),
- _("Number of pixels between icons"),
- 0,
- G_MAXINT,
- _ICON_LIST_ICON_PADDING,
- G_PARAM_READABLE));
- gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("top_margin",
- _("Top margin"),
- _("Number of pixels in top margin"),
- 0,
- G_MAXINT,
- _ICON_LIST_TOP_MARGIN,
- G_PARAM_READABLE));
- gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("bottom_margin",
- _("Bottom margin"),
- _("Number of pixels in bottom margin"),
- 0,
- G_MAXINT,
- _ICON_LIST_BOTTOM_MARGIN,
- G_PARAM_READABLE));
-
- gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("left_margin",
- _("Left margin"),
- _("Number of pixels in left margin"),
- 0,
- G_MAXINT,
- _ICON_LIST_LEFT_MARGIN,
- G_PARAM_READABLE));
- gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("right_margin",
- _("Right margin"),
- _("Number of pixels in right margin"),
- 0,
- G_MAXINT,
- _ICON_LIST_RIGHT_MARGIN,
- G_PARAM_READABLE));
-
- /* Signals */
- widget_class->set_scroll_adjustments_signal =
- g_signal_new ("set_scroll_adjustments",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (EggIconListClass, set_scroll_adjustments),
- NULL, NULL,
- _egg_marshal_VOID__OBJECT_OBJECT,
- G_TYPE_NONE, 2,
- GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
-
- icon_list_signals[ITEM_ACTIVATED] =
- g_signal_new ("item_activated",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (EggIconListClass, item_activated),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
- G_TYPE_NONE, 1,
- EGG_TYPE_ICON_LIST_ITEM);
-
- icon_list_signals[SELECTION_CHANGED] =
- g_signal_new ("selection_changed",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (EggIconListClass, selection_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-
- icon_list_signals[ITEM_ADDED] =
- g_signal_new ("item_added",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (EggIconListClass, item_added),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
- G_TYPE_NONE, 1, EGG_TYPE_ICON_LIST_ITEM);
-
- icon_list_signals[ITEM_REMOVED] =
- g_signal_new ("item_removed",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (EggIconListClass, item_removed),
- NULL, NULL,
- g_cclosure_marshal_VOID__BOXED,
- G_TYPE_NONE, 1, EGG_TYPE_ICON_LIST_ITEM);
-
- icon_list_signals[SELECT_ALL] =
- g_signal_new ("select_all",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (EggIconListClass, select_all),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-
- icon_list_signals[UNSELECT_ALL] =
- g_signal_new ("unselect_all",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (EggIconListClass, unselect_all),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-
- icon_list_signals[SELECT_CURSOR_ITEM] =
- g_signal_new ("select_cursor_item",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (EggIconListClass, select_cursor_item),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-
- icon_list_signals[SELECT_CURSOR_ITEM] =
- g_signal_new ("toggle_cursor_item",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (EggIconListClass, toggle_cursor_item),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-
- /* Key bindings */
- gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK, "select_all", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "unselect_all", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_space, 0, "select_cursor_item", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK, "toggle_cursor_item", 0);
-}
-
-
-static void
-egg_icon_list_init (EggIconList *icon_list)
-{
- icon_list->priv = g_new0 (EggIconListPrivate, 1);
- GTK_WIDGET_SET_FLAGS (icon_list, GTK_CAN_FOCUS);
-
- icon_list->priv->width = 0;
- icon_list->priv->height = 0;
- icon_list->priv->selection_mode = GTK_SELECTION_SINGLE;
- icon_list->priv->sort_order = GTK_SORT_ASCENDING;
- icon_list->priv->pressed_button = -1;
- icon_list->priv->press_start_x = -1;
- icon_list->priv->press_start_y = -1;
- icon_list->priv->layout = gtk_widget_create_pango_layout (GTK_WIDGET (icon_list), NULL);
- pango_layout_set_wrap (icon_list->priv->layout, PANGO_WRAP_CHAR);
-
- egg_icon_list_set_adjustments (icon_list, NULL, NULL);
-}
-
-
-/* GObject methods */
-static void
-egg_icon_list_finalize (GObject *object)
-{
- EggIconList *icon_list;
-
- icon_list = EGG_ICON_LIST (object);
-
- if (icon_list->priv->layout_idle_id != 0)
- g_source_remove (icon_list->priv->layout_idle_id);
-
- g_free (icon_list->priv);
-
- (G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-static void
-egg_icon_list_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- EggIconList *icon_list;
-
- icon_list = EGG_ICON_LIST (object);
-
- switch (prop_id)
- {
- case PROP_SELECTION_MODE:
- egg_icon_list_set_selection_mode (icon_list, g_value_get_enum (value));
- break;
- case PROP_SORTED:
- egg_icon_list_set_sorted (icon_list, g_value_get_boolean (value));
- break;
- case PROP_SORT_ORDER:
- egg_icon_list_set_sort_order (icon_list, g_value_get_enum (value));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-egg_icon_list_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- EggIconList *icon_list;
-
- icon_list = EGG_ICON_LIST (object);
-
- switch (prop_id)
- {
- case PROP_SELECTION_MODE:
- g_value_set_enum (value, icon_list->priv->selection_mode);
- break;
- case PROP_SORTED:
- g_value_set_boolean (value, icon_list->priv->sorted);
- break;
- case PROP_SORT_ORDER:
- g_value_set_enum (value, icon_list->priv->sort_order);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-/* GtkWidget signals */
-static void
-egg_icon_list_realize (GtkWidget *widget)
-{
- EggIconList *icon_list;
- GdkWindowAttr attributes;
- gint attributes_mask;
-
- icon_list = EGG_ICON_LIST (widget);
-
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-
- /* Make the main, clipping window */
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
- attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK;
-
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-
- widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
- &attributes, attributes_mask);
- gdk_window_set_user_data (widget->window, widget);
-
- /* Make the window for the icon list */
- attributes.x = 0;
- attributes.y = 0;
- attributes.width = MAX (icon_list->priv->width, widget->allocation.width);
- attributes.height = MAX (icon_list->priv->height, widget->allocation.height);
- attributes.event_mask = (GDK_EXPOSURE_MASK |
- GDK_SCROLL_MASK |
- GDK_POINTER_MOTION_MASK |
- GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK |
- GDK_KEY_PRESS_MASK |
- GDK_KEY_RELEASE_MASK) |
- gtk_widget_get_events (widget);
-
- icon_list->priv->bin_window = gdk_window_new (widget->window,
- &attributes, attributes_mask);
- gdk_window_set_user_data (icon_list->priv->bin_window, widget);
-
- widget->style = gtk_style_attach (widget->style, widget->window);
- gdk_window_set_background (icon_list->priv->bin_window, &widget->style->base[widget->state]);
- gdk_window_set_background (widget->window, &widget->style->base[widget->state]);
-
-
-}
-
-static void
-egg_icon_list_unrealize (GtkWidget *widget)
-{
- EggIconList *icon_list;
-
- icon_list = EGG_ICON_LIST (widget);
-
- gdk_window_set_user_data (icon_list->priv->bin_window, NULL);
- gdk_window_destroy (icon_list->priv->bin_window);
- icon_list->priv->bin_window = NULL;
-
- /* GtkWidget::unrealize destroys children and widget->window */
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-static void
-egg_icon_list_map (GtkWidget *widget)
-{
- EggIconList *icon_list;
-
- icon_list = EGG_ICON_LIST (widget);
-
- GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
-
- gdk_window_show (icon_list->priv->bin_window);
- gdk_window_show (widget->window);
-}
-
-static void
-egg_icon_list_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
-{
- EggIconList *icon_list;
-
- icon_list = EGG_ICON_LIST (widget);
-
- requisition->width = icon_list->priv->width;
- requisition->height = icon_list->priv->height;
-}
-
-static void
-egg_icon_list_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
-{
- EggIconList *icon_list;
-
- widget->allocation = *allocation;
-
- icon_list = EGG_ICON_LIST (widget);
-
- if (GTK_WIDGET_REALIZED (widget))
- {
- gdk_window_move_resize (widget->window,
- allocation->x, allocation->y,
- allocation->width, allocation->height);
- gdk_window_resize (icon_list->priv->bin_window,
- MAX (icon_list->priv->width, allocation->width),
- MAX (icon_list->priv->height, allocation->height));
- }
-
- icon_list->priv->hadjustment->page_size = allocation->width;
- icon_list->priv->hadjustment->page_increment = allocation->width * 0.9;
- icon_list->priv->hadjustment->step_increment = allocation->width * 0.1;
- icon_list->priv->hadjustment->lower = 0;
- icon_list->priv->hadjustment->upper = MAX (allocation->width, icon_list->priv->width);
- gtk_adjustment_changed (icon_list->priv->hadjustment);
-
- icon_list->priv->vadjustment->page_size = allocation->height;
- icon_list->priv->vadjustment->page_increment = allocation->height * 0.9;
- icon_list->priv->vadjustment->step_increment = allocation->width * 0.1;
- icon_list->priv->vadjustment->lower = 0;
- icon_list->priv->vadjustment->upper = MAX (allocation->height, icon_list->priv->height);
- gtk_adjustment_changed (icon_list->priv->vadjustment);
-
- egg_icon_list_layout (icon_list);
-}
-
-static gboolean
-egg_icon_list_expose (GtkWidget *widget,
- GdkEventExpose *expose)
-{
- EggIconList *icon_list;
- GList *icons;
-
- icon_list = EGG_ICON_LIST (widget);
-
- if (expose->window != icon_list->priv->bin_window)
- return FALSE;
-
- for (icons = icon_list->priv->items; icons; icons = icons->next) {
- EggIconListItem *item = icons->data;
- GdkRectangle item_rectangle;
-
- item_rectangle.x = item->x;
- item_rectangle.y = item->y;
- item_rectangle.width = item->width;
- item_rectangle.height = item->height;
-
- if (gdk_region_rect_in (expose->region, &item_rectangle) == GDK_OVERLAP_RECTANGLE_OUT)
- continue;
-
- egg_icon_list_paint_item (icon_list, item, &expose->area);
- }
-
- if (icon_list->priv->rubberbanding)
- {
- GdkRectangle *rectangles;
- gint n_rectangles;
-
- gdk_region_get_rectangles (expose->region,
- &rectangles,
- &n_rectangles);
-
- while (n_rectangles--)
- egg_icon_list_paint_rubberband (icon_list, &rectangles[n_rectangles]);
-
- g_free (rectangles);
- }
-
- return TRUE;
-}
-
-static gboolean
-egg_icon_list_motion (GtkWidget *widget,
- GdkEventMotion *event)
-{
- EggIconList *icon_list;
-
- icon_list = EGG_ICON_LIST (widget);
-
- egg_icon_list_maybe_begin_dragging_items (icon_list, event);
-
- if (icon_list->priv->rubberbanding)
- rubberbanding (widget);
-
- return TRUE;
-}
-
-static gboolean
-egg_icon_list_button_press (GtkWidget *widget,
- GdkEventButton *event)
-{
- EggIconList *icon_list;
- EggIconListItem *item;
- gboolean dirty = FALSE;
-
- icon_list = EGG_ICON_LIST (widget);
-
- if (event->window != icon_list->priv->bin_window)
- return FALSE;
-
- if (!GTK_WIDGET_HAS_FOCUS (widget))
- gtk_widget_grab_focus (widget);
-
- if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
- {
-
- if (icon_list->priv->selection_mode == GTK_SELECTION_NONE)
- return TRUE;
-
- item = egg_icon_list_get_item_at_pos (icon_list,
- event->x, event->y);
-
- if (item != NULL)
- {
- if (icon_list->priv->selection_mode == GTK_SELECTION_MULTIPLE &&
- (event->state & GDK_CONTROL_MASK))
- {
- item->selected = !item->selected;
- dirty = TRUE;
- }
- else
- {
- if (!item->selected)
- {
- egg_icon_list_unselect_all_internal (icon_list, FALSE);
-
- item->selected = TRUE;
- dirty = TRUE;
- }
- }
-
- egg_icon_list_set_cursor_item (icon_list, item);
- egg_icon_list_queue_draw_item (icon_list, item);
-
- /* Save press to possibly begin a drag */
- if (icon_list->priv->pressed_button < 0)
- {
- icon_list->priv->pressed_button = event->button;
- icon_list->priv->press_start_x = event->x;
- icon_list->priv->press_start_y = event->y;
- }
-
- if (!icon_list->priv->last_single_clicked)
- icon_list->priv->last_single_clicked = item;
- }
- else
- {
- if (icon_list->priv->selection_mode != GTK_SELECTION_BROWSE &&
- !(event->state & GDK_CONTROL_MASK))
- {
- dirty = egg_icon_list_unselect_all_internal (icon_list, FALSE);
- }
-
- if (icon_list->priv->selection_mode == GTK_SELECTION_MULTIPLE)
- egg_icon_list_start_rubberbanding (icon_list, event->x, event->y);
- }
-
- }
-
- if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
- {
- item = egg_icon_list_get_item_at_pos (icon_list,
- event->x, event->y);
-
- if (item && item == icon_list->priv->last_single_clicked)
- {
- egg_icon_list_item_activated (icon_list, item);
- }
-
- icon_list->priv->last_single_clicked = NULL;
- }
-
- if (dirty)
- g_signal_emit (icon_list, icon_list_signals[SELECTION_CHANGED], 0);
-
- return TRUE;
-}
-
-static gboolean
-egg_icon_list_button_release (GtkWidget *widget,
- GdkEventButton *event)
-{
- EggIconList *icon_list;
-
- icon_list = EGG_ICON_LIST (widget);
-
- if (icon_list->priv->pressed_button == event->button)
- icon_list->priv->pressed_button = -1;
-
- egg_icon_list_stop_rubberbanding (icon_list);
-
- return TRUE;
-}
-
-
-static gboolean
-egg_icon_list_key_press (GtkWidget *widget,
- GdkEventKey *event)
-{
- if ((* GTK_WIDGET_CLASS (parent_class)->key_press_event) (widget, event))
- return TRUE;
-
- return FALSE;
-
- if ((event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) == 0)
- egg_icon_list_append_typeahead_string (EGG_ICON_LIST (widget), event->string);
-
- return TRUE;
-}
-
-static void
-egg_icon_list_select_first_matching_item (EggIconList *icon_list,
- const char *pattern)
-{
- GList *items;
-
- if (pattern == NULL)
- return;
-
- for (items = icon_list->priv->items; items; items = items->next)
- {
- EggIconListItem *item = items->data;
-
- if (strncmp (pattern, item->label, strlen (pattern)) == 0)
- {
- egg_icon_list_select_item (icon_list, item);
- break;
- }
- }
-}
-
-static void
-rubberbanding (gpointer data)
-{
- EggIconList *icon_list;
- gint x, y;
- GdkRectangle old_area;
- GdkRectangle new_area;
- GdkRectangle common;
- GdkRegion *invalid_region;
-
- icon_list = EGG_ICON_LIST (data);
-
- gdk_window_get_pointer (icon_list->priv->bin_window, &x, &y, NULL);
-
- x = MAX (x, 0);
- y = MAX (y, 0);
-
- old_area.x = MIN (icon_list->priv->rubberband_x1,
- icon_list->priv->rubberband_x2);
- old_area.y = MIN (icon_list->priv->rubberband_y1,
- icon_list->priv->rubberband_y2);
- old_area.width = ABS (icon_list->priv->rubberband_x2 -
- icon_list->priv->rubberband_x1) + 1;
- old_area.height = ABS (icon_list->priv->rubberband_y2 -
- icon_list->priv->rubberband_y1) + 1;
-
- new_area.x = MIN (icon_list->priv->rubberband_x1, x);
- new_area.y = MIN (icon_list->priv->rubberband_y1, y);
- new_area.width = ABS (x - icon_list->priv->rubberband_x1) + 1;
- new_area.height = ABS (y - icon_list->priv->rubberband_y1) + 1;
-
- invalid_region = gdk_region_rectangle (&old_area);
- gdk_region_union_with_rect (invalid_region, &new_area);
-
- gdk_rectangle_intersect (&old_area, &new_area, &common);
- if (common.width > 2 && common.height > 2)
- {
- GdkRegion *common_region;
-
- /* make sure the border is invalidated */
- common.x += 1;
- common.y += 1;
- common.width -= 2;
- common.height -= 2;
-
- common_region = gdk_region_rectangle (&common);
-
- gdk_region_subtract (invalid_region, common_region);
- gdk_region_destroy (common_region);
- }
-
- gdk_window_invalidate_region (icon_list->priv->bin_window, invalid_region, TRUE);
-
- gdk_region_destroy (invalid_region);
-
- icon_list->priv->rubberband_x2 = x;
- icon_list->priv->rubberband_y2 = y;
-
- egg_icon_list_update_rubberband_selection (icon_list);
-}
-
-static void
-egg_icon_list_start_rubberbanding (EggIconList *icon_list,
- gint x,
- gint y)
-{
- GList *items;
-
- g_assert (!icon_list->priv->rubberbanding);
-
- for (items = icon_list->priv->items; items; items = items->next)
- {
- EggIconListItem *item = items->data;
-
- item->selected_before_rubberbanding = item->selected;
- }
-
- icon_list->priv->rubberband_x1 = x;
- icon_list->priv->rubberband_y1 = y;
- icon_list->priv->rubberband_x2 = x;
- icon_list->priv->rubberband_y2 = y;
-
- icon_list->priv->rubberbanding = TRUE;
-
- gtk_grab_add (GTK_WIDGET (icon_list));
-}
-
-static void
-egg_icon_list_stop_rubberbanding (EggIconList *icon_list)
-{
- if (!icon_list->priv->rubberbanding)
- return;
-
- icon_list->priv->rubberbanding = FALSE;
-
- gtk_grab_remove (GTK_WIDGET (icon_list));
-
- gtk_widget_queue_draw (GTK_WIDGET (icon_list));
-}
-
-static gint
-egg_icon_list_sort_func (EggIconListItem *a,
- EggIconListItem *b,
- EggIconList *icon_list)
-{
- gint result;
-
- result = (* icon_list->priv->sort_func) (icon_list, a, b,
- icon_list->priv->sort_data);
-
- if (icon_list->priv->sort_order == GTK_SORT_DESCENDING)
- result = -result;
-
- return result;
-}
-
-static void
-egg_icon_list_insert_item_sorted (EggIconList *icon_list,
- EggIconListItem *item)
-{
- GList *list;
- GList *tmp_list = icon_list->priv->items;
- gint cmp;
-
- egg_icon_list_validate (icon_list);
-
- list = g_list_alloc ();
- item->list = list;
- item->icon_list = icon_list;
- list->data = item;
- egg_icon_list_item_ref (item);
-
- if (!icon_list->priv->items)
- {
- icon_list->priv->items = list;
- icon_list->priv->last_item = list;
- icon_list->priv->item_count += 1;
-
- egg_icon_list_validate (icon_list);
-
- return;
- }
-
- cmp = egg_icon_list_sort_func (item, tmp_list->data, icon_list);
-
- while ((tmp_list->next) && (cmp > 0))
- {
- tmp_list = tmp_list->next;
- cmp = egg_icon_list_sort_func (item, tmp_list->data, icon_list);
- }
-
- if ((!tmp_list->next) && (cmp > 0))
- {
- tmp_list->next = list;
- list->prev = tmp_list;
- icon_list->priv->last_item = list;
- icon_list->priv->item_count += 1;
- egg_icon_list_validate (icon_list);
-
- return;
- }
-
- if (tmp_list->prev)
- {
- tmp_list->prev->next = list;
- list->prev = tmp_list->prev;
- }
-
- list->next = tmp_list;
- tmp_list->prev = list;
-
- if (tmp_list == icon_list->priv->items)
- icon_list->priv->items = list;
-
- icon_list->priv->item_count += 1;
- egg_icon_list_validate (icon_list);
-
- egg_icon_list_queue_layout (icon_list);
-}
-
-
-static void
-egg_icon_list_sort (EggIconList *icon_list)
-{
- egg_icon_list_validate (icon_list);
-
- /* FIXME: We can optimize this */
- icon_list->priv->items = g_list_sort_with_data (icon_list->priv->items,
- (GCompareDataFunc)egg_icon_list_sort_func,
- icon_list);
- icon_list->priv->last_item = g_list_last (icon_list->priv->items);
-
- egg_icon_list_validate (icon_list);
- egg_icon_list_queue_layout (icon_list);
-}
-
-
-static void
-egg_icon_list_validate (EggIconList *icon_list)
-{
-#if 0
- GList *list;
-
- g_print ("----\n");
- for (list = icon_list->priv->items; list; list = list->next)
- {
- EggIconListItem *item = list->data;
-
- g_print ("%s\n", egg_icon_list_item_get_label (item));
- }
- g_print ("----\n");
-#endif
-
- g_assert (g_list_length (icon_list->priv->items) == icon_list->priv->item_count);
- g_assert (g_list_last (icon_list->priv->items) == icon_list->priv->last_item);
- g_assert (g_list_first (icon_list->priv->last_item) == icon_list->priv->items);
-}
-
-static void
-egg_icon_list_update_rubberband_selection (EggIconList *icon_list)
-{
- GList *items;
- gint x, y, width, height;
- gboolean dirty = FALSE;
-
- x = MIN (icon_list->priv->rubberband_x1,
- icon_list->priv->rubberband_x2);
- y = MIN (icon_list->priv->rubberband_y1,
- icon_list->priv->rubberband_y2);
- width = ABS (icon_list->priv->rubberband_x1 -
- icon_list->priv->rubberband_x2);
- height = ABS (icon_list->priv->rubberband_y1 -
- icon_list->priv->rubberband_y2);
-
- for (items = icon_list->priv->items; items; items = items->next)
- {
- EggIconListItem *item = items->data;
- gboolean is_in;
- gboolean selected;
-
- is_in = egg_icon_list_item_hit_test (item, x, y, width, height);
-
- selected = is_in ^ item->selected_before_rubberbanding;
-
- if (item->selected != selected)
- {
- item->selected = selected;
- dirty = TRUE;
- egg_icon_list_queue_draw_item (icon_list, item);
- }
- }
-
- if (dirty)
- g_signal_emit (icon_list, icon_list_signals[SELECTION_CHANGED], 0);
-}
-
-static gboolean
-egg_icon_list_item_hit_test (EggIconListItem *item,
- gint x,
- gint y,
- gint width,
- gint height)
-{
- /* First try the pixbuf */
- if (MIN (x + width, item->pixbuf_x + item->pixbuf_width) - MAX (x, item->pixbuf_x) > 0 &&
- MIN (y + height, item->pixbuf_y + item->pixbuf_height) - MAX (y, item->pixbuf_y) > 0)
- return TRUE;
-
- /* Then try the text */
- if (MIN (x + width, item->layout_x + item->layout_width) - MAX (x, item->layout_x) > 0 &&
- MIN (y + height, item->layout_y + item->layout_height) - MAX (y, item->layout_y) > 0)
- return TRUE;
-
- return FALSE;
-}
-
-static gboolean
-egg_icon_list_maybe_begin_dragging_items (EggIconList *icon_list,
- GdkEventMotion *event)
-{
- gboolean retval = FALSE;
- gint button;
- if (icon_list->priv->pressed_button < 0)
- return retval;
-
- if (!gtk_drag_check_threshold (GTK_WIDGET (icon_list),
- icon_list->priv->press_start_x,
- icon_list->priv->press_start_y,
- event->x, event->y))
- return retval;
-
- button = icon_list->priv->pressed_button;
- icon_list->priv->pressed_button = -1;
-
- {
- static GtkTargetEntry row_targets[] = {
- { "EGG_ICON_LIST_ITEMS", GTK_TARGET_SAME_APP, 0 }
- };
- GtkTargetList *target_list;
- GdkDragContext *context;
- EggIconListItem *item;
-
- retval = TRUE;
-
- target_list = gtk_target_list_new (row_targets, G_N_ELEMENTS (row_targets));
-
- context = gtk_drag_begin (GTK_WIDGET (icon_list),
- target_list, GDK_ACTION_MOVE,
- button,
- (GdkEvent *)event);
-
- item = egg_icon_list_get_item_at_pos (icon_list,
- icon_list->priv->press_start_x,
- icon_list->priv->press_start_y);
- g_assert (item != NULL);
- gtk_drag_set_icon_pixbuf (context, egg_icon_list_item_get_icon (item),
- event->x - item->x,
- event->y - item->y);
- }
-
- return retval;
-}
-
-
-static gboolean
-egg_icon_list_unselect_all_internal (EggIconList *icon_list,
- gboolean emit)
-{
- gboolean dirty = FALSE;
- GList *items;
-
- for (items = icon_list->priv->items; items; items = items->next)
- {
- EggIconListItem *item = items->data;
-
- if (item->selected)
- {
- item->selected = FALSE;
- dirty = TRUE;
- egg_icon_list_queue_draw_item (icon_list, item);
- }
- }
-
- if (emit && dirty)
- g_signal_emit (icon_list, icon_list_signals[SELECTION_CHANGED], 0);
-
- return dirty;
-}
-
-
-/* EggIconList signals */
-static void
-egg_icon_list_set_adjustments (EggIconList *icon_list,
- GtkAdjustment *hadj,
- GtkAdjustment *vadj)
-{
- gboolean need_adjust = FALSE;
-
- if (hadj)
- g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
- else
- hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
- if (vadj)
- g_return_if_fail (GTK_IS_ADJUSTMENT (vadj));
- else
- vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
-
- if (icon_list->priv->hadjustment && (icon_list->priv->hadjustment != hadj))
- {
- g_signal_handlers_disconnect_matched (icon_list->priv->hadjustment, G_SIGNAL_MATCH_DATA,
- 0, 0, NULL, NULL, icon_list);
- g_object_unref (icon_list->priv->hadjustment);
- }
-
- if (icon_list->priv->vadjustment && (icon_list->priv->vadjustment != vadj))
- {
- g_signal_handlers_disconnect_matched (icon_list->priv->vadjustment, G_SIGNAL_MATCH_DATA,
- 0, 0, NULL, NULL, icon_list);
- g_object_unref (icon_list->priv->vadjustment);
- }
-
- if (icon_list->priv->hadjustment != hadj)
- {
- icon_list->priv->hadjustment = hadj;
- g_object_ref (icon_list->priv->hadjustment);
- gtk_object_sink (GTK_OBJECT (icon_list->priv->hadjustment));
-
- g_signal_connect (icon_list->priv->hadjustment, "value_changed",
- G_CALLBACK (egg_icon_list_adjustment_changed),
- icon_list);
- need_adjust = TRUE;
- }
-
- if (icon_list->priv->vadjustment != vadj)
- {
- icon_list->priv->vadjustment = vadj;
- g_object_ref (icon_list->priv->vadjustment);
- gtk_object_sink (GTK_OBJECT (icon_list->priv->vadjustment));
-
- g_signal_connect (icon_list->priv->vadjustment, "value_changed",
- G_CALLBACK (egg_icon_list_adjustment_changed),
- icon_list);
- need_adjust = TRUE;
- }
-
- if (need_adjust)
- egg_icon_list_adjustment_changed (NULL, icon_list);
-}
-
-static void
-egg_icon_list_real_select_all (EggIconList *icon_list)
-{
- if (icon_list->priv->selection_mode != GTK_SELECTION_MULTIPLE)
- return;
-
- egg_icon_list_select_all (icon_list);
-}
-
-static void
-egg_icon_list_real_unselect_all (EggIconList *icon_list)
-{
- if (icon_list->priv->selection_mode == GTK_SELECTION_BROWSE)
- return;
-
- egg_icon_list_unselect_all (icon_list);
-}
-
-static void
-egg_icon_list_real_select_cursor_item (EggIconList *icon_list)
-{
- egg_icon_list_unselect_all (icon_list);
-
- if (icon_list->priv->cursor_item != NULL)
- egg_icon_list_select_item (icon_list, icon_list->priv->cursor_item);
-}
-
-static void
-egg_icon_list_real_toggle_cursor_item (EggIconList *icon_list)
-{
- if (icon_list->priv->selection_mode == GTK_SELECTION_NONE)
- return;
-
- /* FIXME: Use another function here */
- if (icon_list->priv->cursor_item != NULL)
- {
- if (icon_list->priv->selection_mode == GTK_SELECTION_BROWSE)
- icon_list->priv->cursor_item->selected = TRUE;
- else
- icon_list->priv->cursor_item->selected = !icon_list->priv->cursor_item->selected;
-
- egg_icon_list_queue_draw_item (icon_list, icon_list->priv->cursor_item);
- }
-}
-
-/* Internal functions */
-static void
-egg_icon_list_adjustment_changed (GtkAdjustment *adjustment,
- EggIconList *icon_list)
-{
- if (GTK_WIDGET_REALIZED (icon_list))
- {
- gdk_window_move (icon_list->priv->bin_window,
- - icon_list->priv->hadjustment->value,
- - icon_list->priv->vadjustment->value);
- gdk_window_process_updates (icon_list->priv->bin_window, TRUE);
- }
-}
-
-static GList *
-egg_icon_list_layout_single_row (EggIconList *icon_list, GList *first_item, gint *y, gint *maximum_width)
-{
- gint x, current_width, max_height, max_pixbuf_height;
- GList *items, *last_item;
- gint icon_padding;
- gint left_margin, right_margin;
- gint maximum_layout_width;
-
- x = 0;
- max_height = 0;
- max_pixbuf_height = 0;
- items = first_item;
- current_width = 0;
-
- gtk_widget_style_get (GTK_WIDGET (icon_list),
- "icon_padding", &icon_padding,
- "left_margin", &left_margin,
- "right_margin", &right_margin,
- NULL);
-
- x += left_margin;
- current_width += left_margin + right_margin;
- items = first_item;
-
- while (items)
- {
- EggIconListItem *item = items->data;
-
- egg_icon_list_calculate_item_size (icon_list, item);
-
- current_width += MAX (item->width, MINIMUM_ICON_ITEM_WIDTH);
-
- /* Don't add padding to the first or last icon */
-
- if (current_width > GTK_WIDGET (icon_list)->allocation.width &&
- items != first_item)
- break;
-
- maximum_layout_width = MAX (item->pixbuf_width, MINIMUM_ICON_ITEM_WIDTH);
-
- item->y = *y;
- item->x = x;
-
- if (item->width < MINIMUM_ICON_ITEM_WIDTH) {
- item->x += (MINIMUM_ICON_ITEM_WIDTH - item->width) / 2;
- x += (MINIMUM_ICON_ITEM_WIDTH - item->width);
- }
-
- item->pixbuf_x = item->x + (item->width - item->pixbuf_width) / 2;
- item->layout_x = item->x + (item->width - item->layout_width) / 2;
-
- x += item->width;
-
- max_height = MAX (max_height, item->height);
- max_pixbuf_height = MAX (max_pixbuf_height, item->pixbuf_height);
-
- if (current_width > *maximum_width)
- *maximum_width = current_width;
-
- items = items->next;
- }
-
- last_item = items;
-
- *y += max_height + icon_padding;
-
- /* Now go through the row again and align the icons */
- for (items = first_item; items != last_item; items = items->next)
- {
- EggIconListItem *item = items->data;
-
- item->pixbuf_y = item->y + (max_pixbuf_height - item->pixbuf_height);
- item->layout_y = item->pixbuf_y + item->pixbuf_height + ICON_TEXT_PADDING;
-
- /* Update the bounding box */
- item->y = item->pixbuf_y;
-
- /* We may want to readjust the new y coordinate. */
- if (item->y + item->height > *y)
- *y = item->y + item->height;
- }
-
- return last_item;
-}
-
-static void
-egg_icon_list_set_adjustment_upper (GtkAdjustment *adj,
- gdouble upper)
-{
- if (upper != adj->upper)
- {
- gdouble min = MAX (0.0, upper - adj->page_size);
- gboolean value_changed = FALSE;
-
- adj->upper = upper;
-
- if (adj->value > min)
- {
- adj->value = min;
- value_changed = TRUE;
- }
-
- gtk_adjustment_changed (adj);
-
- if (value_changed)
- gtk_adjustment_value_changed (adj);
- }
-}
-
-static void
-egg_icon_list_layout (EggIconList *icon_list)
-{
- gint y = 0, maximum_width = 0;
- GList *icons;
- GtkWidget *widget;
- gint top_margin, bottom_margin;
-
- widget = GTK_WIDGET (icon_list);
- icons = icon_list->priv->items;
-
- gtk_widget_style_get (widget,
- "top_margin", &top_margin,
- "bottom_margin", &bottom_margin,
- NULL);
- y += top_margin;
-
- do
- {
- icons = egg_icon_list_layout_single_row (icon_list, icons, &y, &maximum_width);
- }
- while (icons != NULL);
-
- if (maximum_width != icon_list->priv->width)
- {
- icon_list->priv->width = maximum_width;
- }
- y += bottom_margin;
-
- if (y != icon_list->priv->height)
- {
- icon_list->priv->height = y;
- }
-
- egg_icon_list_set_adjustment_upper (icon_list->priv->hadjustment, icon_list->priv->width);
- egg_icon_list_set_adjustment_upper (icon_list->priv->vadjustment, icon_list->priv->height);
-
- if (GTK_WIDGET_REALIZED (icon_list))
- {
- gdk_window_resize (icon_list->priv->bin_window,
- MAX (icon_list->priv->width, widget->allocation.width),
- MAX (icon_list->priv->height, widget->allocation.height));
- }
-
- if (icon_list->priv->layout_idle_id != 0)
- {
- g_source_remove (icon_list->priv->layout_idle_id);
- icon_list->priv->layout_idle_id = 0;
- }
-
- gtk_widget_queue_draw (GTK_WIDGET (icon_list));
-}
-
-/* Creates or updates the pango layout and calculates the size */
-static void
-egg_icon_list_calculate_item_size (EggIconList *icon_list, EggIconListItem *item)
-{
- int layout_width, layout_height;
- int maximum_layout_width;
-
- if (item->width != -1 && item->width != -1)
- return;
-
- item->pixbuf_width = gdk_pixbuf_get_width (item->icon);
- item->pixbuf_height = gdk_pixbuf_get_height (item->icon);
-
- maximum_layout_width = MAX (item->pixbuf_width, MINIMUM_ICON_ITEM_WIDTH);
-
- pango_layout_set_markup (icon_list->priv->layout, item->label, -1);
-
- pango_layout_set_alignment (icon_list->priv->layout, PANGO_ALIGN_CENTER);
- pango_layout_set_width (icon_list->priv->layout, maximum_layout_width * PANGO_SCALE);
-
- pango_layout_get_pixel_size (icon_list->priv->layout, &layout_width, &layout_height);
-
- item->width = MAX ((layout_width + 2 * ICON_TEXT_PADDING), item->pixbuf_width);
- item->height = layout_height + 2 * ICON_TEXT_PADDING + item->pixbuf_height;
- item->layout_width = layout_width;
- item->layout_height = layout_height;
-}
-
-static void
-egg_icon_list_item_invalidate_size (EggIconListItem *item)
-{
- item->width = -1;
- item->height = -1;
-}
-
-static GdkPixbuf *
-create_colorized_pixbuf (GdkPixbuf *src, GdkColor *new_color)
-{
- gint i, j;
- gint width, height, has_alpha, src_row_stride, dst_row_stride;
- gint red_value, green_value, blue_value;
- guchar *target_pixels;
- guchar *original_pixels;
- guchar *pixsrc;
- guchar *pixdest;
- GdkPixbuf *dest;
-
- red_value = new_color->red / 255.0;
- green_value = new_color->green / 255.0;
- blue_value = new_color->blue / 255.0;
-
- dest = gdk_pixbuf_new (gdk_pixbuf_get_colorspace (src),
- gdk_pixbuf_get_has_alpha (src),
- gdk_pixbuf_get_bits_per_sample (src),
- gdk_pixbuf_get_width (src),
- gdk_pixbuf_get_height (src));
-
- has_alpha = gdk_pixbuf_get_has_alpha (src);
- width = gdk_pixbuf_get_width (src);
- height = gdk_pixbuf_get_height (src);
- src_row_stride = gdk_pixbuf_get_rowstride (src);
- dst_row_stride = gdk_pixbuf_get_rowstride (dest);
- target_pixels = gdk_pixbuf_get_pixels (dest);
- original_pixels = gdk_pixbuf_get_pixels (src);
-
- for (i = 0; i < height; i++) {
- pixdest = target_pixels + i*dst_row_stride;
- pixsrc = original_pixels + i*src_row_stride;
- for (j = 0; j < width; j++) {
- *pixdest++ = (*pixsrc++ * red_value) >> 8;
- *pixdest++ = (*pixsrc++ * green_value) >> 8;
- *pixdest++ = (*pixsrc++ * blue_value) >> 8;
- if (has_alpha) {
- *pixdest++ = *pixsrc++;
- }
- }
- }
- return dest;
-}
-
-static void
-egg_icon_list_paint_item (EggIconList *icon_list,
- EggIconListItem *item,
- GdkRectangle *area)
-{
- GdkPixbuf *pixbuf;
- GtkStateType state;
-
- if (GTK_WIDGET_HAS_FOCUS (icon_list))
- state = GTK_STATE_SELECTED;
- else
- state = GTK_STATE_ACTIVE;
-
- if (item->selected)
- pixbuf = create_colorized_pixbuf (item->icon,
- >K_WIDGET (icon_list)->style->base[state]);
- else
- pixbuf = gdk_pixbuf_ref (item->icon);
-
- gdk_pixbuf_render_to_drawable_alpha (pixbuf,
- icon_list->priv->bin_window,
- 0, 0,
- item->pixbuf_x,
- item->pixbuf_y,
- item->pixbuf_width,
- item->pixbuf_height,
- GDK_PIXBUF_ALPHA_FULL,
- 0,
- GDK_RGB_DITHER_NORMAL,
- item->pixbuf_width,
- item->pixbuf_height);
- g_object_unref (pixbuf);
-
- if (item->selected)
- {
- gdk_draw_rectangle (icon_list->priv->bin_window,
- GTK_WIDGET (icon_list)->style->base_gc[state],
- TRUE,
- item->layout_x - ICON_TEXT_PADDING,
- item->layout_y - ICON_TEXT_PADDING,
- item->layout_width + 2 * ICON_TEXT_PADDING,
- item->layout_height + 2 * ICON_TEXT_PADDING);
- }
-
- pango_layout_set_markup (icon_list->priv->layout, item->label, -1);
- gdk_draw_layout (icon_list->priv->bin_window,
- GTK_WIDGET (icon_list)->style->text_gc[item->selected ? state : GTK_STATE_NORMAL],
- item->layout_x - ((item->width - item->layout_width) / 2) - (MAX (item->pixbuf_width, MINIMUM_ICON_ITEM_WIDTH) - item->width) / 2,
- item->layout_y,
- icon_list->priv->layout);
-
- if (GTK_WIDGET_HAS_FOCUS (icon_list) &&
- item == icon_list->priv->cursor_item)
- gtk_paint_focus (GTK_WIDGET (icon_list)->style,
- icon_list->priv->bin_window,
- item->selected ? GTK_STATE_SELECTED : GTK_STATE_NORMAL,
- area,
- GTK_WIDGET (icon_list),
- "iconlist",
- item->layout_x - ICON_TEXT_PADDING,
- item->layout_y - ICON_TEXT_PADDING,
- item->layout_width + 2 * ICON_TEXT_PADDING,
- item->layout_height + 2 * ICON_TEXT_PADDING);
-}
-
-static void
-egg_icon_list_paint_rubberband (EggIconList *icon_list,
- GdkRectangle *area)
-{
- GdkRectangle rect;
- GdkPixbuf *pixbuf;
- GdkGC *gc;
- GdkColor color;
- GdkRectangle rubber_rect;
-
- rubber_rect.x = MIN (icon_list->priv->rubberband_x1, icon_list->priv->rubberband_x2);
- rubber_rect.y = MIN (icon_list->priv->rubberband_y1, icon_list->priv->rubberband_y2);
- rubber_rect.width = ABS (icon_list->priv->rubberband_x1 - icon_list->priv->rubberband_x2) + 1;
- rubber_rect.height = ABS (icon_list->priv->rubberband_y1 - icon_list->priv->rubberband_y2) + 1;
-
- if (!gdk_rectangle_intersect (&rubber_rect, area, &rect))
- return;
-
- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, rect.width, rect.height);
- gdk_pixbuf_fill (pixbuf, 0x9db8d27F);
-
- gdk_pixbuf_render_to_drawable_alpha (pixbuf,
- icon_list->priv->bin_window,
- 0, 0,
- rect.x,rect.y,
- rect.width, rect.height,
- GDK_PIXBUF_ALPHA_FULL,
- 0,
- GDK_RGB_DITHER_NONE,
- 0, 0);
- g_object_unref (pixbuf);
- gc = gdk_gc_new (icon_list->priv->bin_window);
- color.red = 0x72 * 255;
- color.green = 0x7d * 255;
- color.blue = 0x97 * 255;
- gdk_gc_set_rgb_fg_color (gc, &color);
- gdk_gc_set_clip_rectangle (gc, &rect);
- gdk_draw_rectangle (icon_list->priv->bin_window,
- gc, FALSE,
- rubber_rect.x, rubber_rect.y,
- rubber_rect.width - 1, rubber_rect.height - 1);
- g_object_unref (gc);
-}
-
-static void
-egg_icon_list_queue_draw_item (EggIconList *icon_list,
- EggIconListItem *item)
-{
- GdkRectangle rect;
-
- rect.x = item->x;
- rect.y = item->y;
- rect.width = item->width;
- rect.height = item->height;
-
- gdk_window_invalidate_rect (icon_list->priv->bin_window, &rect, TRUE);
-}
-
-static gboolean
-layout_callback (gpointer user_data)
-{
- EggIconList *icon_list;
-
- icon_list = EGG_ICON_LIST (user_data);
-
- icon_list->priv->layout_idle_id = 0;
-
- egg_icon_list_layout (icon_list);
-
- return FALSE;
-}
-
-static void
-egg_icon_list_queue_layout (EggIconList *icon_list)
-{
- if (icon_list->priv->layout_idle_id != 0)
- return;
-
- icon_list->priv->layout_idle_id = g_idle_add (layout_callback, icon_list);
-}
-
-static void
-egg_icon_list_set_cursor_item (EggIconList *icon_list,
- EggIconListItem *item)
-{
- if (icon_list->priv->cursor_item == item)
- return;
-
- if (icon_list->priv->cursor_item != NULL)
- egg_icon_list_queue_draw_item (icon_list, icon_list->priv->cursor_item);
-
- icon_list->priv->cursor_item = item;
- egg_icon_list_queue_draw_item (icon_list, item);
-}
-
-static void
-egg_icon_list_append_typeahead_string (EggIconList *icon_list,
- const gchar *string)
-{
- int i;
- char *typeahead_string;
-
- if (strlen (string) == 0)
- return;
-
- for (i = 0; i < strlen (string); i++)
- {
- if (!g_ascii_isprint (string[i]))
- return;
- }
-
- typeahead_string = g_strconcat (icon_list->priv->typeahead_string ?
- icon_list->priv->typeahead_string : "",
- string, NULL);
- g_free (icon_list->priv->typeahead_string);
- icon_list->priv->typeahead_string = typeahead_string;
-
- egg_icon_list_select_first_matching_item (icon_list,
- icon_list->priv->typeahead_string);
-
- g_print ("wooo: \"%s\"\n", typeahead_string);
-}
-
-/* Public API */
-GtkWidget *
-egg_icon_list_new (void)
-{
- EggIconList *icon_list;
-
- icon_list = g_object_new (EGG_TYPE_ICON_LIST, NULL);
-
- return GTK_WIDGET (icon_list);
-}
-
-EggIconListItem *
-egg_icon_list_item_new (GdkPixbuf *icon,
- const char *label)
-{
- EggIconListItem *item;
-
- item = g_new0 (EggIconListItem, 1);
-
- item->ref_count = 1;
- item->width = -1;
- item->height = -1;
- item->label = g_strdup (label);
- item->icon = g_object_ref (icon);
-
- return item;
-}
-
-void
-egg_icon_list_item_ref (EggIconListItem *item)
-{
- g_return_if_fail (item != NULL);
-
- item->ref_count += 1;
-}
-
-void
-egg_icon_list_item_unref (EggIconListItem *item)
-{
- g_return_if_fail (item != NULL);
-
- item->ref_count -= 1;
-
- if (item->ref_count == 0)
- {
- g_free (item->label);
- g_object_unref (item->icon);
- g_free (item);
- }
-
-}
-
-void
-egg_icon_list_item_set_data (EggIconListItem *item,
- gpointer data)
-{
- egg_icon_list_item_set_data_full (item, data, NULL);
-}
-
-void
-egg_icon_list_item_set_data_full (EggIconListItem *item,
- gpointer data,
- GDestroyNotify destroy_notify)
-{
- g_return_if_fail (item != NULL);
-
- if (item->destroy_notify)
- item->destroy_notify (item->user_data);
-
- item->destroy_notify = destroy_notify;
- item->user_data = data;
-}
-
-gpointer
-egg_icon_list_item_get_data (EggIconListItem *item)
-{
- g_return_val_if_fail (item != NULL, NULL);
-
- return item->user_data;
-}
-
-void
-egg_icon_list_item_set_label (EggIconListItem *item,
- const char *label)
-{
- g_return_if_fail (item != NULL);
- g_return_if_fail (label != NULL);
-
- if (strcmp (item->label, label) == 0)
- return;
-
- g_free (item->label);
- item->label = g_strdup (label);
- egg_icon_list_item_invalidate_size (item);
-
- egg_icon_list_queue_layout (item->icon_list);
-}
-
-G_CONST_RETURN gchar *
-egg_icon_list_item_get_label (EggIconListItem *item)
-{
- g_return_val_if_fail (item != NULL, NULL);
-
- return item->label;
-}
-
-void
-egg_icon_list_item_set_icon (EggIconListItem *item,
- GdkPixbuf *icon)
-{
- g_return_if_fail (item != NULL);
-
- if (icon == item->icon)
- return;
-
- g_object_unref (item->icon);
- item->icon = g_object_ref (icon);
-
- egg_icon_list_item_invalidate_size (item);
-
- egg_icon_list_queue_layout (item->icon_list);
-}
-
-GdkPixbuf *
-egg_icon_list_item_get_icon (EggIconListItem *item)
-{
- g_return_val_if_fail (item != NULL, NULL);
-
- return item->icon;
-}
-
-void
-egg_icon_list_append_item (EggIconList *icon_list,
- EggIconListItem *item)
-{
- GList *list;
-
- g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
- g_return_if_fail (item != NULL);
- g_return_if_fail (item->icon_list == NULL);
-
- if (icon_list->priv->sorted)
- {
- egg_icon_list_insert_item_sorted (icon_list, item);
- return;
- }
-
- egg_icon_list_validate (icon_list);
-
- list = g_list_alloc ();
- item->list = list;
- item->icon_list = icon_list;
- list->data = item;
- egg_icon_list_item_ref (item);
-
- if (icon_list->priv->last_item)
- {
- icon_list->priv->last_item->next = list;
- list->prev = icon_list->priv->last_item;
- }
- else
- icon_list->priv->items = list;
-
- icon_list->priv->last_item = list;
- icon_list->priv->item_count += 1;
-
- egg_icon_list_validate (icon_list);
-
- g_signal_emit (icon_list, icon_list_signals[ITEM_ADDED], 0, item);
-
- egg_icon_list_queue_layout (icon_list);
-}
-
-void
-egg_icon_list_prepend_item (EggIconList *icon_list,
- EggIconListItem *item)
-{
- GList *list;
-
- g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
- g_return_if_fail (item != NULL);
- g_return_if_fail (item->icon_list == NULL);
-
- egg_icon_list_validate (icon_list);
-
- list = g_list_alloc ();
- item->list = list;
- item->icon_list = icon_list;
- list->data = item;
- egg_icon_list_item_ref (item);
-
- if (icon_list->priv->last_item == NULL)
- icon_list->priv->last_item = list;
-
- if (icon_list->priv->items)
- icon_list->priv->items->prev = list;
-
- list->next = icon_list->priv->items;
- icon_list->priv->items = list;
- icon_list->priv->item_count += 1;
-
- egg_icon_list_validate (icon_list);
-
- g_signal_emit (icon_list, icon_list_signals[ITEM_ADDED], 0, item);
-
- egg_icon_list_queue_layout (icon_list);
-
-}
-
-
-void
-egg_icon_list_insert_item_before (EggIconList *icon_list,
- EggIconListItem *sibling,
- EggIconListItem *item)
-{
- GList *list;
-
- g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
- g_return_if_fail (item != NULL);
- g_return_if_fail (item->icon_list == NULL);
-
- if (icon_list->priv->sorted)
- {
- egg_icon_list_insert_item_sorted (icon_list, item);
- return;
- }
-
- if (sibling == NULL)
- egg_icon_list_append_item (icon_list, item);
-
- egg_icon_list_validate (icon_list);
-
- list = g_list_alloc ();
- item->list = list;
- item->icon_list = icon_list;
- list->data = item;
- egg_icon_list_item_ref (item);
-
- list->prev = sibling->list->prev;
- list->next = sibling->list;
- sibling->list->prev->next = list;
- sibling->list->prev = list;
-
- if (sibling->list == icon_list->priv->items)
- icon_list->priv->items = list;
-
- icon_list->priv->item_count += 1;
- egg_icon_list_validate (icon_list);
-
- g_signal_emit (icon_list, icon_list_signals[ITEM_ADDED], 0, item);
-
- egg_icon_list_queue_layout (icon_list);
-}
-
-void
-egg_icon_list_insert_item_after (EggIconList *icon_list,
- EggIconListItem *sibling,
- EggIconListItem *item)
-{
- GList *list;
-
- g_return_if_fail (EGG_IS_ICON_LIST (icon_list));
- g_return_if_fail (item != NULL);
- g_return_if_fail (item->icon_list == NULL);
-
- if (icon_list->priv->sorted)
- {
- egg_icon_list_insert_item_sorted (icon_list, item);
- return;
- }
-
- if (sibling == NULL)
- {
- egg_icon_list_prepend_item (icon_list, item);
- return;
- }
-
- egg_icon_list_validate (icon_list);
-
- list = g_list_alloc ();
- item->list = list;
- item->icon_list = icon_list;
- list->data = item;
- egg_icon_list_item_ref (item);
-
- list->next = sibling...
[truncated message content] |
1 message has been excluded from this view by a project administrator.
![http://www.morphix.org/doc/how_tos/images/MorphixLiveKiosk.png"](http://www.morphix.org/doc/how_tos/images/MorphixLiveKiosk.png"){kind=link}