- Handling all SK categories, from mariano.

* data/toc.xml.in:
- Handling all SK categories, from mariano.

* src/yelp-window.c:
- Start with Loading..., so the titlebar doesn't look like ass.

1 files changed, 277 insertions, 216 deletions

diff --git a/data/toc.xml.in b/data/toc.xml.in
index edd31edc..39c82ff0 100644
--- a/data/toc.xml.in
+++ b/data/toc.xml.in
@@ -1,232 +1,293 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="toc.xml.in.content/toc.css" type="text/css"?>
+<!DOCTYPE toc [
+<!ELEMENT toc (_title?, category*, toc*) >
+<!ATTLIST toc id ID #REQUIRED >
+<!ELEMENT _title (#PCDATA) >
+<!ELEMENT category (#PCDATA) >
+]>
 <toc id="index">
 	<_title>Help Contents</_title>
 
 	<toc id="Desktop">
 		<_title>Desktop</_title>
 
-		<category>GNOME|Core Desktop</category>
-		<category>GNOME|Desktop</category>
-	</toc>
+		<toc id="GNOME">
+			<_title>GNOME</_title>
 
-	<toc id="Games">
-		<_title>Games and Entertainment</_title>
-
-		<category>Applications|Amusement</category>
-		<category>Applications|Games</category>
-		<category>Applications|Games|Arcade</category>
-		<category>Applications|Games|Board</category>
-		<category>Applications|Games|First Person Shooters</category>
-		<category>Applications|Games|Puzzles</category>
-		<category>Applications|Games|Fighting</category>
-		<category>Applications|Games|Role-Playing</category>
-		<category>Applications|Games|Simulation</category>
-		<category>Applications|Games|Strategy</category>
-		<category>Applications|Games|Other</category>
-		<category>GNOME|Games</category>
-	</toc>
+			<category>GNOME</category>
+			<category>GNOME|Core Desktop</category>
+			<category>GNOME|Desktop</category>
+			<category>GNOME|Applets</category>
+			<category>GNOME|Applets|Amusement</category>
+			<category>GNOME|Applets|Clock</category>
+			<category>GNOME|Applets|Monitors</category>
+			<category>GNOME|Applets|Multimedia</category>
+			<category>GNOME|Applets|Network</category>
+			<category>GNOME|Applets|Utility</category>
+			<category>GNOME|Applications</category>
+			<category>GNOME|Utilities</category>
+			<category>GNOME|Development</category>
+			<category>GNOME|Development|Applications</category>
+			<category>GNOME|Development|Introductory</category>
+			<category>GNOME|Development|Tutorials</category>
+			<category>GNOME|Development|White Papers</category>
+			<category>GNOME|Graphics</category>
+			<category>GNOME|Settings</category>
+			<category>GNOME|System</category>
+			<category>GNOME|Other</category>
+		</toc>
+
+		<toc id="KDE">
+			<_title>KDE</_title>
 
-	<toc id="Education">
-		<_title>Education Applications</_title>
-
-		<category>Applications|Education</category>
-		<category>Applications|Eduction|Arts</category>
-		<category>Applications|Eduction|Computer Science</category>
-		<category>Applications|Eduction|English</category>
-		<category>Applications|Eduction|Language</category>
-		<category>Applications|Eduction|Maths</category>
-		<category>Applications|Eduction|Music</category>
-		<category>Applications|Eduction|Science</category>
-		<category>Applications|Eduction|Technology</category>
-		<category>Applications|Eduction|Testing</category>
-		<category>Applications|Eduction|Other</category>
+			<category>KDE</category>
+			<category>KDE|Utilities</category>
+		</toc>
 	</toc>
 
-	<toc id="Internet">
-		<_title>Internet Applications</_title>
-
-		<category>Applications|Internet</category>
-		<category>Applications|Internet|Chat</category>
-		<category>Applications|Internet|Email</category>
-		<category>Applications|Internet|Fax</category>
-		<category>Applications|Internet|File Sharing</category>
-		<category>Applications|Internet|FTP</category>
-		<category>Applications|Internet|Internet Phone</category>
-		<category>Applications|Internet|Messaging</category>
-		<category>Applications|Internet|News</category>
-		<category>Applications|Internet|Video Conferencing</category>
-		<category>Applications|Internet|Web</category>
-		<category>Applications|Internet|Other</category>
-		<category>GNOME|Internet</category>
+	<toc id="Applications">
+		<_title>Applications</_title>
+
+		<toc id="Games">
+			<_title>Games and Entertainment</_title>
+
+			<category>Applications|Amusement</category>
+			<category>Applications|Games</category>
+			<category>Applications|Games|Arcade</category>
+			<category>Applications|Games|Board</category>
+			<category>Applications|Games|First Person Shooters</category>
+			<category>Applications|Games|Puzzles</category>
+			<category>Applications|Games|Fighting</category>
+			<category>Applications|Games|Role-Playing</category>
+			<category>Applications|Games|Simulation</category>
+			<category>Applications|Games|Strategy</category>
+			<category>Applications|Games|Other</category>
+			<category>GNOME|Games</category>
+		</toc>
+
+		<toc id="Education">
+			<_title>Education Applications</_title>
+
+			<category>Applications|Education</category>
+			<category>Applications|Eduction|Arts</category>
+			<category>Applications|Eduction|Computer Science</category>
+			<category>Applications|Eduction|English</category>
+			<category>Applications|Eduction|Language</category>
+			<category>Applications|Eduction|Maths</category>
+			<category>Applications|Eduction|Music</category>
+			<category>Applications|Eduction|Science</category>
+			<category>Applications|Eduction|Technology</category>
+			<category>Applications|Eduction|Testing</category>
+			<category>Applications|Eduction|Other</category>
+		</toc>
+
+		<toc id="Internet">
+			<_title>Internet Applications</_title>
+
+			<category>Applications|Internet</category>
+			<category>Applications|Internet|Chat</category>
+			<category>Applications|Internet|Email</category>
+			<category>Applications|Internet|Fax</category>
+			<category>Applications|Internet|File Sharing</category>
+			<category>Applications|Internet|FTP</category>
+			<category>Applications|Internet|Internet Phone</category>
+			<category>Applications|Internet|Messaging</category>
+			<category>Applications|Internet|News</category>
+			<category>Applications|Internet|Video Conferencing</category>
+			<category>Applications|Internet|Web</category>
+			<category>Applications|Internet|Other</category>
+			<category>GNOME|Internet</category>
+		</toc>
+
+		<toc id="Multimedia">
+			<_title>Multimedia Applications</_title>
+
+			<category>Applications|Multimedia</category>
+			<category>Applications|Multimedia|Graphics</category>
+			<category>Applications|Multimedia|Graphics|3D Modelling</category>
+			<category>Applications|Multimedia|Graphics|3D Rendering</category>
+			<category>Applications|Multimedia|Graphics|CAD</category>
+			<category>Applications|Multimedia|Graphics|Capture</category>
+			<category>Applications|Multimedia|Graphics|Conversion</category>
+			<category>Applications|Multimedia|Graphics|Drawing</category>
+			<category>Applications|Multimedia|Graphics|Editing</category>
+			<category>Applications|Multimedia|Graphics|Viewing</category>
+			<category>Applications|Multimedia|Graphics|Other</category>
+			<category>Applications|Multimedia|Sound</category>
+			<category>Applications|Multimedia|Sound|Analysis</category>
+			<category>Applications|Multimedia|Sound|CD Mastering</category>
+			<category>Applications|Multimedia|Sound|Conversion</category>
+			<category>Applications|Multimedia|Sound|Editing</category>
+			<category>Applications|Multimedia|Sound|MIDI</category>
+			<category>Applications|Multimedia|Sound|Mixers</category>
+			<category>Applications|Multimedia|Sound|Players</category>
+			<category>Applications|Multimedia|Sound|Recording</category>
+			<category>Applications|Multimedia|Sound|Speech</category>
+			<category>Applications|Multimedia|Sound|Other</category>
+			<category>Applications|Multimedia|Video</category>
+			<category>Applications|Multimedia|Video|Capture</category>
+			<category>Applications|Multimedia|Video|Conversion</category>
+			<category>Applications|Multimedia|Video|Display</category>
+			<category>Applications|Multimedia|Video|Editing</category>
+			<category>Applications|Multimedia|Video|Other</category>
+			<category>Applications|Multimedia|Other</category>
+			<category>GNOME|Multimedia</category>
+		</toc>
+
+		<toc id="Office">
+			<_title>Office and Productivity Applications</_title>
+
+			<category>Applications|Office</category>
+			<category>Applications|Office|Calendar</category>
+			<category>Applications|Office|Data Processing</category>
+			<category>Applications|Office|Database</category>
+			<category>Applications|Office|Email</category>
+			<category>Applications|Office|Financial</category>
+			<category>Applications|Office|PIM</category>
+			<category>Applications|Office|Plotting</category>
+			<category>Applications|Office|Presentation</category>
+			<category>Applications|Office|Publishing</category>
+			<category>Applications|Office|Publishing|Web Publishing</category>
+			<category>Applications|Office|Word Processing</category>
+			<category>Applications|Office|Other</category>
+		</toc>
+
+		<toc id="Scientific">
+			<_title>Scientific Applications</_title>
+
+			<category>Applications|Scientific</category>
+			<category>Applications|Scientific|Astronomy</category>
+			<category>Applications|Scientific|Astrophysics</category>
+			<category>Applications|Scientific|Biology</category>
+			<category>Applications|Scientific|Chemistry</category>
+			<category>Applications|Scientific|EDA</category>
+			<category>Applications|Scientific|Genetics</category>
+			<category>Applications|Scientific|Math</category>
+			<category>Applications|Scientific|Physics</category>
+			<category>Applications|Scientific|Visualisation</category>
+			<category>Applications|Scientific|Other</category>
+		</toc>
+
+		<toc id="Security">
+			<_title>Securities</_title>
+		
+			<category>Applications|Security</category>
+			<category>Applications|Security|Cryptography</category>
+			<category>Applications|Security|Other</category>
+		</toc>
+
+		<toc id="Editors">
+			<_title>Editors</_title>
+		
+			<category>Applications|Text Editors</category>
+			<category>Applications|Text Editors|CLI</category>
+			<category>Applications|Text Editors|GUI</category>
+			<category>Applications|Text Editors|Other</category>
+		</toc>
+		
+		<toc id="Utilities">
+			<_title>Utilities</_title>
+		
+			<category>Applications|Utilities</category>
+			<category>Applications|Utilities|Archiving</category>
+			<category>Applications|Utilities|Calculating</category>
+			<category>Applications|Utilities|Clocks</category>
+			<category>Applications|Utilities|Compression</category>
+			<category>Applications|Utilities|File Utilities</category>
+			<category>Applications|Utilities|Monitors</category>
+			<category>Applications|Utilities|Printing</category>
+			<category>Applications|Utilities|Terminals</category>
+			<category>Applications|Utilities|Text Utilities</category>
+			<category>Applications|Utilities|Other</category>
+		</toc>
+		
+		<toc id="X">
+			<_title>X Applications</_title>
+		
+			<category>Applications|X</category>
+			<category>Applications|X|Configuration</category>
+			<category>Applications|X|Fonts</category>
+			<category>Applications|X|Login Managers</category>
+			<category>Applications|X|Screensavers</category>
+			<category>Applications|X|Window Managers</category>
+			<category>Applications|X|Other</category>
+			<category>CDE</category>
+		</toc>
 	</toc>
 
-	<toc id="Multimedia">
-		<_title>Multimedia Applications</_title>
-
-		<category>Applications|Multimedia</category>
-		<category>Applications|Multimedia|Graphics</category>
-		<category>Applications|Multimedia|Graphics|3D Modelling</category>
-		<category>Applications|Multimedia|Graphics|3D Rendering</category>
-		<category>Applications|Multimedia|Graphics|CAD</category>
-		<category>Applications|Multimedia|Graphics|Capture</category>
-		<category>Applications|Multimedia|Graphics|Conversion</category>
-		<category>Applications|Multimedia|Graphics|Drawing</category>
-		<category>Applications|Multimedia|Graphics|Editing</category>
-		<category>Applications|Multimedia|Graphics|Viewing</category>
-		<category>Applications|Multimedia|Graphics|Other</category>
-		<category>Applications|Multimedia|Sound</category>
-		<category>Applications|Multimedia|Sound|Analysis</category>
-		<category>Applications|Multimedia|Sound|CD Mastering</category>
-		<category>Applications|Multimedia|Sound|Conversion</category>
-		<category>Applications|Multimedia|Sound|Editing</category>
-		<category>Applications|Multimedia|Sound|MIDI</category>
-		<category>Applications|Multimedia|Sound|Mixers</category>
-		<category>Applications|Multimedia|Sound|Players</category>
-		<category>Applications|Multimedia|Sound|Recording</category>
-		<category>Applications|Multimedia|Sound|Speech</category>
-		<category>Applications|Multimedia|Sound|Other</category>
-		<category>Applications|Multimedia|Video</category>
-		<category>Applications|Multimedia|Video|Capture</category>
-		<category>Applications|Multimedia|Video|Conversion</category>
-		<category>Applications|Multimedia|Video|Display</category>
-		<category>Applications|Multimedia|Video|Editing</category>
-		<category>Applications|Multimedia|Video|Other</category>
-		<category>Applications|Multimedia|Other</category>
-		<category>GNOME|Multimedia</category>
+	<toc id="Development">
+		<_title>Development</_title>
+
+		<category>Development</category>
+		<category>Development|Databases</category>
+
+		<toc id="Tools">
+			<_title>Development Tools</_title>
+
+			<category>Development|Development Tools</category>
+			<category>Development|Development Tools|Build Tools</category>
+			<category>Development|Development Tools|Code Generators</category>
+			<category>Development|Development Tools|Configuration</category>
+			<category>Development|Development Tools|Debuggers</category>
+			<category>Development|Development Tools|IDEs</category>
+			<category>Development|Development Tools|Packaging</category>
+			<category>Development|Development Tools|Profiling</category>
+			<category>Development|Development Tools|RAD</category>
+			<category>Development|Development Tools|Version Control</category>
+			<category>Development|Development Tools|Other</category>
+		</toc>
+
+		<toc id="Environments">
+			<_title>Development Environments</_title>
+
+			<category>Development|Environments</category>
+			<category>Development|Environments|ADA</category>
+			<category>Development|Environments|C</category>
+			<category>Development|Environments|C++</category>
+			<category>Development|Environments|GNOME</category>
+			<category>Development|Environments|GTK+</category>
+			<category>Development|Environments|gtk++</category>
+			<category>Development|Environments|Java</category>
+			<category>Development|Environments|KDE</category>
+			<category>Development|Environments|Perl</category>
+			<category>Development|Environments|Python</category>
+			<category>Development|Environments|Qt</category>
+			<category>Development|Environments|Tcl/Tk</category>
+			<category>Development|Environments|WebML</category>
+			<category>Development|Environments|Other</category>
+		</toc>
+
+		<toc id="Kernels">
+			<_title>Kernels</_title>
+			<category>Development|Kernels</category>
+			<category>Development|Kernels|FreeBSD</category>
+			<category>Development|Kernels|Linux</category>
+			<category>Development|Kernels|NetBSD</category>
+			<category>Development|Kernels|Other</category>
+			<category>Development|Libraries</category>
+			<category>Development|System Calls</category>
+			<category>Development|Other</category>
+		</toc>
 	</toc>
 
-	<toc id="Office">
-		<_title>Office and Productivity Applications</_title>
-
-		<category>Applications|Office</category>
-		<category>Applications|Office|Calendar</category>
-		<category>Applications|Office|Data Processing</category>
-		<category>Applications|Office|Database</category>
-		<category>Applications|Office|Email</category>
-		<category>Applications|Office|Financial</category>
-		<category>Applications|Office|PIM</category>
-		<category>Applications|Office|Plotting</category>
-		<category>Applications|Office|Presentation</category>
-		<category>Applications|Office|Publishing</category>
-		<category>Applications|Office|Publishing|Web Publishing</category>
-		<category>Applications|Office|Word Processing</category>
-		<category>Applications|Office|Other</category>
+	<toc id="General">
+		<_title>General</_title>
+	
+		<category>General</category>
+		<category>General|Licenses</category>
+		<category>General|Linux</category>
+		<category>General|Linux|Distributions</category>
+		<category>General|Linux|Distributions|Caldera</category>
+		<category>General|Linux|Distributions|Debian</category>
+		<category>General|Linux|Distributions|Mandrake</category>
+		<category>General|Linux|Distributions|Red Flag</category>
+		<category>General|Linux|Distributions|Red Hat</category>
+		<category>General|Linux|Distributions|Slackware</category>
+		<category>General|Linux|Distributions|SuSE</category>
+		<category>General|Linux|Distributions|Other</category>
+		<category>General|Linux|General</category>
+		<category>General|Linux|Other</category>
+		<category>General|Other</category>
 	</toc>
-</toc>
-
-<!--
-Applications
-
-<_title>Scientific Applications</_title>
-Applications|Scientific
-Applications|Scientific|Astronomy
-Applications|Scientific|Astrophysics
-Applications|Scientific|Biology
-Applications|Scientific|Chemistry
-Applications|Scientific|EDA
-Applications|Scientific|Genetics
-Applications|Scientific|Math
-Applications|Scientific|Physics
-Applications|Scientific|Visualisation
-Applications|Scientific|Other
-
-
-Applications|Security
-Applications|Security|Cryptography
-Applications|Security|Other
-Applications|Text Editors
-Applications|Text Editors|CLI
-Applications|Text Editors|GUI
-Applications|Text Editors|Other
-Applications|Utilities
-Applications|Utilities|Archiving
-Applications|Utilities|Calculating
-Applications|Utilities|Clocks
-Applications|Utilities|Compression
-Applications|Utilities|File Utilities
-Applications|Utilities|Monitors
-Applications|Utilities|Printing
-Applications|Utilities|Terminals
-Applications|Utilities|Text Utilities
-Applications|Utilities|Other
-Applications|X
-Applications|X|Configuration
-Applications|X|Fonts
-Applications|X|Login Managers
-Applications|X|Screensavers
-Applications|X|Window Managers
-Applications|X|Other
-CDE
-Development
-Development|Databases
-Development|Development Tools
-Development|Development Tools|Build Tools
-Development|Development Tools|Code Generators
-Development|Development Tools|Configuration
-Development|Development Tools|Debuggers
-Development|Development Tools|IDEs
-Development|Development Tools|Packaging
-Development|Development Tools|Profiling
-Development|Development Tools|RAD
-Development|Development Tools|Version Control
-Development|Development Tools|Other
-Development|Environments
-Development|Environments|ADA
-Development|Environments|C
-Development|Environments|C++
-Development|Environments|GNOME
-Development|Environments|GTK+
-Development|Environments|gtk++
-Development|Environments|Java
-Development|Environments|KDE
-Development|Environments|Perl
-Development|Environments|Python
-Development|Environments|Qt
-Development|Environments|Tcl/Tk
-Development|Environments|WebML
-Development|Environments|Other
-Development|Kernels
-Development|Kernels|FreeBSD
-Development|Kernels|Linux
-Development|Kernels|NetBSD
-Development|Kernels|Other
-Development|Libraries
-Development|System Calls
-Development|Other
-General
-General|Licenses
-General|Linux
-General|Linux|Distributions
-General|Linux|Distributions|Caldera
-General|Linux|Distributions|Debian
-General|Linux|Distributions|Mandrake
-General|Linux|Distributions|Red Flag
-General|Linux|Distributions|Red Hat
-General|Linux|Distributions|Slackware
-General|Linux|Distributions|SuSE
-General|Linux|Distributions|Other
-General|Linux|General
-General|Linux|Other
-General|Other
-GNOME
-GNOME|Applets
-GNOME|Applets|Amusement
-GNOME|Applets|Clock
-GNOME|Applets|Monitors
-GNOME|Applets|Multimedia
-GNOME|Applets|Network
-GNOME|Applets|Utility
-GNOME|Applications
-GNOME|Utilities
-GNOME|Development
-GNOME|Development|Applications
-GNOME|Development|Introductory
-GNOME|Development|Tutorials
-GNOME|Development|White Papers
-GNOME|Graphics
-GNOME|Settings
-GNOME|System
-GNOME|Other
-KDE
-KDE|Utilities
--->
\ No newline at end of file
+</toc>
\ No newline at end of file