[maemo-commits] [maemo-commits] r8494 - in projects/haf/trunk/hildon-theme-layout-3: . rc

From: www-data at stage.maemo.org www-data at stage.maemo.org
Date: Thu Nov 30 14:16:38 EET 2006
Author: mdk
Date: 2006-11-30 14:16:20 +0200 (Thu, 30 Nov 2006)
New Revision: 8494

Added:
   projects/haf/trunk/hildon-theme-layout-3/rc/afterincludes.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/afterthemespecificgtk.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/base.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/defaultarrows.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkbutton.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkbuttonbox.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkcalendar.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckbutton.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckmenuitem.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkcombobox.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkdialog.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkentry.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkentrycompletion.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkexpander.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkfilechooserbutton.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkframe.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenu.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenuitem.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenutoolbutton.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtknotebook.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkpaned.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkprogressbar.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkradiobutton.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkrange.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc.maemo_af_desktop.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrollbar.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrolledwindow.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkseparator.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtksettings.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtktextview.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtktoggletoolbutton.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbar.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbutton.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtktreeview.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonapp.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonbanners.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonbreadcrumbbutton.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildoncandidatebox.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildoncaption.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildoncolorchooser.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildoncontrolbar.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildondateeditor.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildongrid.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonhome.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonkeyboard.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigator.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigatorpopuplist.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonnote.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonnumbereditor.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonseekbar.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonstatusbar.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildontimeeditor.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildontimepicker.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonvolumebar.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonweekdaypicker.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/ossoapplicationinstaller.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/ossoclock.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/ossoglobalsearch.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/ossointernetsearchapplet.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/ossoiradioapplet.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/ossomediaplayer.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/ossorssfeedreader.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/ossortc.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/ossospeeddial.rc
   projects/haf/trunk/hildon-theme-layout-3/rc/themespecificgtk.rc
Removed:
   projects/haf/trunk/hildon-theme-layout-3/rc/afterincludes
   projects/haf/trunk/hildon-theme-layout-3/rc/afterthemespecificgtk
   projects/haf/trunk/hildon-theme-layout-3/rc/base
   projects/haf/trunk/hildon-theme-layout-3/rc/defaultarrows
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkbutton
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkbuttonbox
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkcalendar
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckbutton
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckmenuitem
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkcombobox
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkdialog
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkentry
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkentrycompletion
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkexpander
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkfilechooserbutton
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkframe
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenu
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenuitem
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenutoolbutton
   projects/haf/trunk/hildon-theme-layout-3/rc/gtknotebook
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkpaned
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkprogressbar
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkradiobutton
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkrange
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc.maemo_af_desktop
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrollbar
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrolledwindow
   projects/haf/trunk/hildon-theme-layout-3/rc/gtkseparator
   projects/haf/trunk/hildon-theme-layout-3/rc/gtksettings
   projects/haf/trunk/hildon-theme-layout-3/rc/gtktextview
   projects/haf/trunk/hildon-theme-layout-3/rc/gtktoggletoolbutton
   projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbar
   projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbutton
   projects/haf/trunk/hildon-theme-layout-3/rc/gtktreeview
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonapp
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonbanners
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonbreadcrumbbutton
   projects/haf/trunk/hildon-theme-layout-3/rc/hildoncandidatebox
   projects/haf/trunk/hildon-theme-layout-3/rc/hildoncaption
   projects/haf/trunk/hildon-theme-layout-3/rc/hildoncolorchooser
   projects/haf/trunk/hildon-theme-layout-3/rc/hildoncontrolbar
   projects/haf/trunk/hildon-theme-layout-3/rc/hildondateeditor
   projects/haf/trunk/hildon-theme-layout-3/rc/hildongrid
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonhome
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonkeyboard
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigator
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigatorpopuplist
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonnote
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonnumbereditor
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonseekbar
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonstatusbar
   projects/haf/trunk/hildon-theme-layout-3/rc/hildontimeeditor
   projects/haf/trunk/hildon-theme-layout-3/rc/hildontimepicker
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonvolumebar
   projects/haf/trunk/hildon-theme-layout-3/rc/hildonweekdaypicker
   projects/haf/trunk/hildon-theme-layout-3/rc/ossoapplicationinstaller
   projects/haf/trunk/hildon-theme-layout-3/rc/ossoclock
   projects/haf/trunk/hildon-theme-layout-3/rc/ossoglobalsearch
   projects/haf/trunk/hildon-theme-layout-3/rc/ossointernetsearchapplet
   projects/haf/trunk/hildon-theme-layout-3/rc/ossoiradioapplet
   projects/haf/trunk/hildon-theme-layout-3/rc/ossomediaplayer
   projects/haf/trunk/hildon-theme-layout-3/rc/ossorssfeedreader
   projects/haf/trunk/hildon-theme-layout-3/rc/ossortc
   projects/haf/trunk/hildon-theme-layout-3/rc/ossospeeddial
   projects/haf/trunk/hildon-theme-layout-3/rc/themespecificgtk
Modified:
   projects/haf/trunk/hildon-theme-layout-3/ChangeLog
   projects/haf/trunk/hildon-theme-layout-3/rc/Makefile.am
Log:
Renaming files to .rc and making it build (include) gtkrc and gtkrc.maemo_af_desktop. Currently all broken.


Modified: projects/haf/trunk/hildon-theme-layout-3/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/ChangeLog	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/ChangeLog	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,3 +1,8 @@
+2006-11-30  Michael Dominic K.  <mdk at mdk.am> 
+
+	* rc/: Renaming files to .rc and making it build (include) gtkrc and
+	gtkrc.maemo_af_desktop. Currently all broken.
+
 2006-11-29  Michael Dominic K.  <mdk at mdk.am> 
 
 	* rc/index.theme: Always used default icon theme (for now).

Modified: projects/haf/trunk/hildon-theme-layout-3/rc/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/Makefile.am	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/Makefile.am	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,75 +1,79 @@
-templatedir = ${datadir}/hildon-theme-layout-3/
+layoutdir 				= ${datadir}/@PACKAGE@/
 
-nobase_dist_template_DATA =		\
-     afterincludes			\
-     afterthemespecificgtk		\
-     defaultarrows			\
-     gtkbutton				\
-     gtkbuttonbox			\
-     gtkcalendar			\
-     gtkcheckbutton			\
-     gtkcheckmenuitem			\
-     gtkcombobox			\
-     gtkdialog				\
-     gtkentry				\
-     gtkentrycompletion			\
-     gtkexpander			\
-     gtkfilechooserbutton		\
-     gtkframe				\
-     gtkmenu				\
-     gtkmenuitem			\
-     gtkmenutoolbutton			\
-     gtknotebook			\
-     gtkpaned				\
-     gtkprogressbar			\
-     gtkradiobutton			\
-     gtkrange				\
-     gtkrc				\
-     gtkrc.maemo_af_desktop		\
-     gtkscrollbar			\
-     gtkscrolledwindow			\
-     gtkseparator			\
-     gtksettings			\
-     gtktextview			\
-     gtktoggletoolbutton		\
-     gtktoolbar				\
-     gtktoolbutton			\
-     gtktreeview			\
-     hildonapp				\
-     hildonbanners			\
-     hildonbreadcrumbbutton		\
-     hildoncandidatebox			\
-     hildoncaption			\
-     hildoncolorchooser			\
-     hildoncontrolbar			\
-     hildondateeditor			\
-     hildongrid				\
-     hildonhome				\
-     hildonkeyboard			\
-     hildonnavigator			\
-     hildonnavigatorpopuplist		\
-     hildonnote				\
-     hildonnumbereditor			\
-     hildonseekbar			\
-     hildonstatusbar			\
-     hildontimeeditor			\
-     hildontimepicker			\
-     hildonvolumebar			\
-     hildonweekdaypicker		\
-     ossoapplicationinstaller		\
-     ossoclock				\
-     ossoglobalsearch			\
-     ossomediaplayer			\
-     ossointernetsearchapplet		\
-     ossoiradioapplet			\
-     ossorssfeedreader			\
-     ossortc				\
-     ossospeeddial			\
-     themespecificgtk			\
-     layout.txt				\
-     theme.xml				\
-     index.theme			\
-     base
+layout_DATA 				= gtkrc gtkrc.maemo_af_desktop
 
-MAINTAINERCLEANFILES			= Makefile.in 
+RC_FILES				= afterincludes.rc 		\
+					  afterthemespecificgtk.rc 	\
+					  base.rc 			\
+					  defaultarrows.rc 		\
+					  gtkbutton.rc 			\
+					  gtkbuttonbox.rc 		\
+					  gtkcalendar.rc 		\
+					  gtkcheckbutton.rc 		\
+					  gtkcheckmenuitem.rc 		\
+					  gtkcombobox.rc 		\
+					  gtkdialog.rc 			\
+					  gtkentry.rc 			\
+					  gtkentrycompletion.rc 	\
+					  gtkexpander.rc 		\
+					  gtkfilechooserbutton.rc 	\
+					  gtkframe.rc 			\
+					  gtkmenu.rc 			\
+					  gtkmenuitem.rc 		\
+					  gtkmenutoolbutton.rc 		\
+					  gtknotebook.rc 		\
+					  gtkpaned.rc 			\
+					  gtkprogressbar.rc 		\
+					  gtkradiobutton.rc 		\
+					  gtkrange.rc 			\
+					  gtkrc.maemo_af_desktop.rc 	\
+					  gtkrc.rc 			\
+					  gtkscrollbar.rc 		\
+					  gtkscrolledwindow.rc 		\
+					  gtkseparator.rc 		\
+					  gtksettings.rc 		\
+					  gtktextview.rc 		\
+					  gtktoggletoolbutton.rc 	\
+					  gtktoolbar.rc 		\
+					  gtktoolbutton.rc 		\
+					  gtktreeview.rc 		\
+					  hildonapp.rc 			\
+					  hildonbanners.rc 		\
+					  hildonbreadcrumbbutton.rc 	\
+					  hildoncandidatebox.rc 	\
+					  hildoncaption.rc 		\
+					  hildoncolorchooser.rc 	\
+					  hildoncontrolbar.rc 		\
+					  hildondateeditor.rc 		\
+					  hildongrid.rc 		\
+					  hildonhome.rc 		\
+					  hildonkeyboard.rc 		\
+					  hildonnavigator.rc 		\
+					  hildonnavigatorpopuplist.rc 	\
+					  hildonnote.rc 		\
+					  hildonnumbereditor.rc 	\
+					  hildonseekbar.rc 		\
+					  hildonstatusbar.rc 		\
+					  hildontimeeditor.rc 		\
+					  hildontimepicker.rc 		\
+					  hildonvolumebar.rc 		\
+					  hildonweekdaypicker.rc 	\
+					  ossoapplicationinstaller.rc 	\
+					  ossoclock.rc 			\
+					  ossoglobalsearch.rc 		\
+					  ossointernetsearchapplet.rc 	\
+					  ossoiradioapplet.rc 		\
+					  ossomediaplayer.rc 		\
+					  ossorssfeedreader.rc 		\
+					  ossortc.rc 			\
+					  ossospeeddial.rc 		\
+					  themespecificgtk.rc
 
+gtkrc: $(RC_FILES)
+	hildon-theme-rc-parser gtkrc.rc gtkrc
+
+gtkrc.maemo_af_desktop: $(RC_FILES)
+	hildon-theme-rc-parser gtkrc.maemo_af_desktop.rc gtkrc.maemo_af_desktop
+
+MAINTAINERCLEANFILES			= Makefile.in gtkrc gtkrc.maemo_af_desktop
+

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/afterincludes
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/afterincludes	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/afterincludes	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,37 +0,0 @@
-
-##################
-# STUFF DONE AFTER INCLUDES
-#
-# This sets these styles if no other style 
-# has been already set.
-##################
-
-widget "*osso-SystemFont" style "osso-SystemFont"
-widget "*osso-EmpSystemFont" style "osso-EmpSystemFont"
-widget "*osso-TitleFont" style "osso-TitleFont"
-widget "*osso-ButtonFont" style "osso-ButtonFont"
-widget "*osso-SmallFont" style "osso-SmallFont"
-widget "*osso-LargeFont" style "osso-LargeFont"
-widget "*osso-HWRFont1" style "osso-HWRFont1"
-widget "*osso-HWRFont2" style "osso-HWRFont2"
-
-# Setting default font style
-class "GtkWidget" style "osso-SystemFont"
-
-# Setting application menu pop-up position
-widget "*.menu_force_with_corners" style "osso-application-menu-popup-position"
-
-# Setting GtkEntry drawing type flag (whether to use our gtk_paint_box or
-# gtk's original gtk_paint_shadow
-class "GtkEntry" style "osso-entry-special"
-
-####
-# To be moved :
-####
-
-style "Toolbar_max_expand"
-{
-GtkToolbar::max_child_expand = 48
-}
-
-class "GtkWidget" style "Toolbar_max_expand"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/afterincludes.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/afterincludes)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/afterthemespecificgtk
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/afterthemespecificgtk	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/afterthemespecificgtk	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,35 +0,0 @@
-
-class "GtkWidget" style "osso-logical-colors"
-
-style "osso-color-themeing" = "osso-logical-colors" {
-  fg[NORMAL] = "DefaultTextColor"
-  bg[NORMAL] = "DefaultBackgrdColor"
-
-  fg[PRELIGHT] = "DefaultTextColor"
-  bg[PRELIGHT] = "DefaultBackgrdColor"
-
-  fg[ACTIVE] = "DefaultTextColor"
-  bg[ACTIVE] = "PaintedBackgrdColor"
-                                                                                                                                    
-  fg[SELECTED] = "DefaultTextColor"
-  bg[SELECTED] = "PaintedBackgrdColor"
-                                                                                                                                     
-  fg[INSENSITIVE] = "DisabledTextColor"
-  bg[INSENSITIVE] = "DefaultBackgrdColor"
-                                                                                                                                     
-  text[NORMAL] = "DefaultTextColor"
-  base[NORMAL] = "DefaultBackgrdColor"
-                                                                                                                                     
-  text[PRELIGHT] = "DefaultTextColor"
-  base[PRELIGHT] = "DefaultBackgrdColor"
-                                                                                                                                     
-  text[ACTIVE] = "PaintedDefaultTextColor"
-  base[ACTIVE] = "PaintedBackgrdColor"
-
-  text[SELECTED] = "PaintedDefaultTextColor"
-  base[SELECTED] = "PaintedBackgrdColor"
-                                                                                                                                    
-  text[INSENSITIVE] = "DisabledTextColor"
-  base[INSENSITIVE] = "DefaultBackgrdColor"
-}
-class "GtkWidget" style "osso-color-themeing"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/afterthemespecificgtk.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/afterthemespecificgtk)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/base
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/base	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/base	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,169 +0,0 @@
-# OSSO WIDGET LOOK PROBLEMS
-# 
-# - Gtk scales _images_ instead of _widgets_ being scaled according
-#   to image size.  Widgets are scaled according layout and the internal
-#   widget layout/size is according to hardcoded widget code.
-#   If you don't let images to be stretched, they might be clipped
-#   (e.g. checkbox) or drawn partly outside parent widget (e.g. arrows).
-# - Style definitions are theme engine specific.
-# - Focus is always shown on the editable part of the widget,
-#   not on the label beside the editable part.  On menus also
-#   the arrow is highlighted.
-#
-#
-# OSSO WIDGET PROBLEMS
-#
-# - Menubar widget has to be made into a menu itself.
-# - Different button styles and different look for buttons
-#   when there are several buttons in a row.
-#
-#
-# POSITIVE SIDE
-#
-# - Lots of widgets.
-# - Can use any images (any style).
-# - Color can be changed also for images if one uses
-#   grayscale images (recolorable attribute).
-# - Anything can have focus and everything is keyboard navigatable,
-#   keyboard bindings are changable.
-# - Accessibility framework (untested).
-# - Input methods (untested).
-#
-# TODO
-# - Scale the arrow images to such size that you can tell
-#   Gtk not to scale them.
-#
-# When creating a new style, include a "osso-" -prefix to it.
-#
-##################################################
-# Default draw and background color settings
-##################################################
-
-style "osso-default"
-{
-  # 'fg' = foreground in state, 'bg' = background in given state
-  # 'text' = text color in state, 'base' = text background in state
-  # styles:
-  #   NORMAL:      normal widget state
-  #   PRELIGHT:    e.g. mouse over
-  #   ACTIVE:      active widget part, e.g. pressed scrollbar trough
-  #   SELECTED:    data selection highlight color, e.g. items in list widget
-  #   INSENSITIVE: disabled widget
-
-# global picture theming.
-#  GtkWidget::hildonlike = 1
-  GtkWidget::hildon-focus-handling = 1
-  GtkWidget::focus-line-width = 0
-  GtkWidget::focus-padding = 0
-  GtkWidget::focus-line-pattern = "\0\0\0\0\0\0\0\0"
-
-# Removed because this changes wrapping and results in incorrect wrapping
-# (and truncating) in dialogs.
-#  GtkLabel::hildonlike = 1
-
-  GtkWidget::scroll-arrow-hlength = 20
-  GtkWidget::scroll-arrow-vlength = 20
-
-  GtkToggleButton::hildonlike = 1
-  GtkCalendar::hildonlike = 1
-
-  engine "sapwood"
-  {
-    # selected text in entries, text widget, lists and trees
-    image
-      {
-	function = BOX
-	detail = "selection"
-	file = "../images/qgn_plat_focus_active.png"
-	border = { 2, 2, 2, 2 }
-      }
-#    image
-#      {
-#	function = FLAT_BOX
-#	detail = "text"
-#	file = "../sbarrowup.png"
-#	border = { 0, 0, 0, 0 }
-#      }
-#    # hline and vline
-#    image
-#      {
-#        function        = HLINE
-#        file            = "../hline.png"
-#        border          = { 2, 2, 0, 0 }
-#        stretch         = TRUE
-#      }
-#    image
-#      {
-#        function        = VLINE
-#        file            = "../black.png"
-#        border          = { 0, 0, 0, 0 }
-#        stretch         = TRUE
-#      }
-#
-#    # do not draw widget focus at all. 
-#    image
-#      {
-#        function        = FOCUS
-#        overlay_file    = "../transparent.png"
-#        overlay_border  = { 4, 4, 4, 4 }
-#        overlay_stretch = TRUE
-#      }
-    image
-      {
-        function = FOCUS
-      }
-  }
-
-}
-class "GtkWidget" style "osso-default"
-
-
-# recolorable=TRUE in the 'image' section means that the
-# image is grayscale and can be colored.
-
-#################################################### 
-# ABOUT STYLES
-#
-# The way that multiple RC styles bound to the same 
-# widget are prioritized is that RC styles bound with 
-# widget take precedence over RC styles bound with 
-# widget_class, which, in turn, take precedence over 
-# RC styles bound with class. For multiple declarations 
-# of the same type, later declarations take precedence 
-# over earlier ones.
-#################################################### 
-
-###########
-# PROBABLY WON'T BE USED
-###########
-
-###########
-# NEED TO BE PROCESSED
-###########
-
-# Uncomment these lines to get the tap-and-hold functionality
-# enabled with selected widget, (n.b. that you'll have to run
-# the hildon-tap-hold.diff to GTK to get it work)
-#style "hildon-tap-hold"
-#{
-#  GtkWidget::tap-hold = 1
-#}
-#class "GtkEntry" style "hildon-tap-hold"
-#class "GtkTextView" style "hildon-tap-hold"	
-
-#################
-# REAL, FINISHED STUFF.
-#################
-
-#This has to be first because of font styles.
-
-
-
-# Maemo af desktop widgets included in gtkrc.maemo_af_desktop
-
-
-#include "../../../sapwoods/hildon-icons/stockrc"
-
-##################
-# THESE HAVE MISSING IMAGES BUT ARE HERE BECAUSE OF STYLE PROPERTIES
-##################

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/base.rc (from rev 8447, projects/haf/trunk/hildon-theme-layout-3/rc/base)
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/base	2006-11-29 11:19:23 UTC (rev 8447)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/base.rc	2006-11-30 12:16:20 UTC (rev 8494)
@@ -0,0 +1,166 @@
+# OSSO WIDGET LOOK PROBLEMS
+# 
+# - Gtk scales _images_ instead of _widgets_ being scaled according
+#   to image size.  Widgets are scaled according layout and the internal
+#   widget layout/size is according to hardcoded widget code.
+#   If you don't let images to be stretched, they might be clipped
+#   (e.g. checkbox) or drawn partly outside parent widget (e.g. arrows).
+# - Style definitions are theme engine specific.
+# - Focus is always shown on the editable part of the widget,
+#   not on the label beside the editable part.  On menus also
+#   the arrow is highlighted.
+#
+#
+# OSSO WIDGET PROBLEMS
+#
+# - Menubar widget has to be made into a menu itself.
+# - Different button styles and different look for buttons
+#   when there are several buttons in a row.
+#
+#
+# POSITIVE SIDE
+#
+# - Lots of widgets.
+# - Can use any images (any style).
+# - Color can be changed also for images if one uses
+#   grayscale images (recolorable attribute).
+# - Anything can have focus and everything is keyboard navigatable,
+#   keyboard bindings are changable.
+# - Accessibility framework (untested).
+# - Input methods (untested).
+#
+# TODO
+# - Scale the arrow images to such size that you can tell
+#   Gtk not to scale them.
+#
+# When creating a new style, include a "osso-" -prefix to it.
+#
+##################################################
+# Default draw and background color settings
+##################################################
+
+style "osso-default"
+{
+  # 'fg' = foreground in state, 'bg' = background in given state
+  # 'text' = text color in state, 'base' = text background in state
+  # styles:
+  #   NORMAL:      normal widget state
+  #   PRELIGHT:    e.g. mouse over
+  #   ACTIVE:      active widget part, e.g. pressed scrollbar trough
+  #   SELECTED:    data selection highlight color, e.g. items in list widget
+  #   INSENSITIVE: disabled widget
+
+# global picture theming.
+#  GtkWidget::hildonlike = 1
+  GtkWidget::hildon-focus-handling = 1
+  GtkWidget::focus-line-width = 0
+  GtkWidget::focus-padding = 0
+  GtkWidget::focus-line-pattern = "\0\0\0\0\0\0\0\0"
+
+# Removed because this changes wrapping and results in incorrect wrapping
+# (and truncating) in dialogs.
+#  GtkLabel::hildonlike = 1
+
+  GtkWidget::scroll-arrow-hlength = 20
+  GtkWidget::scroll-arrow-vlength = 20
+
+  GtkToggleButton::hildonlike = 1
+  GtkCalendar::hildonlike = 1
+
+  engine "sapwood"
+  {
+    # selected text in entries, text widget, lists and trees
+    image
+      {
+	function = BOX
+	detail = "selection"
+	file = "../images/qgn_plat_focus_active.png"
+	border = { 2, 2, 2, 2 }
+      }
+#    image
+#      {
+#	function = FLAT_BOX
+#	detail = "text"
+#	file = "../sbarrowup.png"
+#	border = { 0, 0, 0, 0 }
+#      }
+#    # hline and vline
+#    image
+#      {
+#        function        = HLINE
+#        file            = "../hline.png"
+#        border          = { 2, 2, 0, 0 }
+#        stretch         = TRUE
+#      }
+#    image
+#      {
+#        function        = VLINE
+#        file            = "../black.png"
+#        border          = { 0, 0, 0, 0 }
+#        stretch         = TRUE
+#      }
+#
+#    # do not draw widget focus at all. 
+#    image
+#      {
+#        function        = FOCUS
+#        overlay_file    = "../transparent.png"
+#        overlay_border  = { 4, 4, 4, 4 }
+#        overlay_stretch = TRUE
+#      }
+    image
+      {
+        function = FOCUS
+      }
+  }
+
+}
+class "GtkWidget" style "osso-default"
+
+
+# recolorable=TRUE in the 'image' section means that the
+# image is grayscale and can be colored.
+
+#################################################### 
+# ABOUT STYLES
+#
+# The way that multiple RC styles bound to the same 
+# widget are prioritized is that RC styles bound with 
+# widget take precedence over RC styles bound with 
+# widget_class, which, in turn, take precedence over 
+# RC styles bound with class. For multiple declarations 
+# of the same type, later declarations take precedence 
+# over earlier ones.
+#################################################### 
+
+###########
+# PROBABLY WON'T BE USED
+###########
+
+###########
+# NEED TO BE PROCESSED
+###########
+
+# Uncomment these lines to get the tap-and-hold functionality
+# enabled with selected widget, (n.b. that you'll have to run
+# the hildon-tap-hold.diff to GTK to get it work)
+#style "hildon-tap-hold"
+#{
+#  GtkWidget::tap-hold = 1
+#}
+#class "GtkEntry" style "hildon-tap-hold"
+#class "GtkTextView" style "hildon-tap-hold"	
+
+#################
+# REAL, FINISHED STUFF.
+#################
+
+#This has to be first because of font styles.
+
+
+
+# Maemo af desktop widgets included in gtkrc.maemo_af_desktop
+
+##################
+# THESE HAVE MISSING IMAGES BUT ARE HERE BECAUSE OF STYLE PROPERTIES
+##################

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/defaultarrows
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/defaultarrows	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/defaultarrows	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,157 +0,0 @@
-style "hildon-default-arrows"
-{
-  # different arrows in different states
-  engine "sapwood"
-  {
-
-    # left
-    image
-      {
-        function        = ARROW
-	state           = ACTIVE
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_arrow_left_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	state           = SELECTED
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_arrow_left_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	state           = INSENSITIVE
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_arrow_left_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_arrow_left_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    
-    # right
-    image
-      {
-        function        = ARROW
-	state           = ACTIVE
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_arrow_right_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	state           = SELECTED
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_arrow_right_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	state           = INSENSITIVE
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_arrow_right_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_arrow_right_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-
-    # up
-    image
-      {
-        function        = ARROW
-	state           = ACTIVE
-	arrow_direction = UP
-	overlay_file    = "../images/qgn_plat_arrow_up_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	state           = SELECTED
-	arrow_direction = UP
-	overlay_file    = "../images/qgn_plat_arrow_up_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      } 
-    image
-      {
-        function        = ARROW
-	state           = INSENSITIVE
-	arrow_direction = UP
-	overlay_file    = "../images/qgn_plat_arrow_up_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	arrow_direction = UP
-	overlay_file    = "../images/qgn_plat_arrow_up_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    
-    # down
-    image
-      {
-        function        = ARROW
-	state           = ACTIVE
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_arrow_down_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image    
-      {
-        function        = ARROW
-	state           = SELECTED
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_arrow_down_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	state           = INSENSITIVE
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_arrow_down_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_arrow_down_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-  }
-}
-
-class "GtkWidget" style "hildon-default-arrows"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/defaultarrows.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/defaultarrows)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkbutton
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkbutton	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkbutton	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,1104 +0,0 @@
-#################################################### 
-# GTK BUTTON
-#
-# Copyright 2004,2005 Nokia Oyj
-#
-# Both Dialog buttons and view buttons are themed
-# here.
-#
-# TODO :
-#   - pressed&active state needed for togglebuttons?
-#   - can focused_pressed & pressed states be combined?
-#   - Separate support for horizontal / vertical
-#     viewbutton images?
-# 
-# Buttons inside GtkHButton will 
-# automatically look like dialog buttons.
-#
-# Buttons inside a GtkTable will
-# automatically look like view buttons.
-#
-# There is also a button image used for a button
-# that is not inside either GtkHButtonBox or GtkTable.
-#
-# Buttons will have different graphics depending on
-# the position they are in relation to other buttons.
-# We are using button details for that.
-#
-# Button details are following:
-#
-# - osso_button
-# - osso_button_tl
-# - osso_button_tr
-# - osso_button_bl
-# - osso_button_br
-# - osso_button_tl_bl
-# - osso_button_tr_br
-# - osso_button_tl_tr
-# - osso_button_bl_br
-# - osso_button_tl_tr_bl_br
-#
-# Where tl, tr, bl and br indicate whether the that
-# button is connected to topleft, topright, bottomleft 
-# and bottomright corners of the container.
-#
-# Therefore osso_button_tl is the graphics used for
-# the top-left button in gtktable and osso_button_tl_tr
-# is used for rightmost dialogbutton. osso_button_tl_tr_bl_br
-# is used when button is alone.
-#
-# Only osso_button. osso_button_tl_bl, osso_button_tr_br and
-# osso_button_tl_tr_bl_br is used for dialog buttons.
-#
-# Buttons not inside either GtkHButtonBox or GtkTable use
-# following detail.
-#
-# - buttondefault
-#
-#################################################### 
-
-# Normal Button styles:
-style "osso-button" {
-
-  GtkWidget::focus-line-pattern = "\0\0\0\0\0\0\0\0"
-  GtkWidget::focus-width = 0
-  GtkButton::default_border = { 0, 0, 0, 0 }
-  GtkButton::child-displacement-x = -2
-  GtkButton::child-displacement-y = 2
-  GtkButton::interior_focus = 0
-  GtkButton::child_spacing = 1
-  xthickness = 7
-  ythickness = 0
-
-  engine "sapwood" {
-
-    # Default button
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "buttondefault"
-	file     = "../images/qgn_plat_view_button_nesw_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "buttondefault"
-	file     = "../images/qgn_plat_view_button_nesw_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = BOX
-	shadow   = IN
-	detail   = "buttondefault"
-	file     = "../images/qgn_plat_view_button_nesw_pressed.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = BOX
-	state    = SELECTED
-	detail   = "buttondefault"
-	file     = "../images/qgn_plat_view_button_nesw_pressed.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = BOX
-	state    = INSENSITIVE
-	detail   = "buttondefault"
-	file     = "../images/qgn_plat_view_button_nesw_disabled.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail   = "buttondefault"
-	file     = "../images/qgn_plat_view_button_nesw.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button"
-	file     = "../images/qgn_plat_view_button_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button"
-	file     = "../images/qgn_plat_view_button_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button"
-	file     = "../images/qgn_plat_view_button_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button"
-	file     = "../images/qgn_plat_view_button_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button"
-	file     = "../images/qgn_plat_view_button_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button"
-	file     = "../images/qgn_plat_view_button.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-    # View buttons
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_n"
-	file     = "../images/qgn_plat_view_button_n_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_n"
-	file     = "../images/qgn_plat_view_button_n_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_n"
-	file     = "../images/qgn_plat_view_button_n_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_n"
-	file     = "../images/qgn_plat_view_button_n_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_n"
-	file     = "../images/qgn_plat_view_button_n_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_n"
-	file     = "../images/qgn_plat_view_button_n.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_e"
-	file     = "../images/qgn_plat_view_button_e_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_e"
-	file     = "../images/qgn_plat_view_button_e_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_e"
-	file     = "../images/qgn_plat_view_button_e_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_e"
-	file     = "../images/qgn_plat_view_button_e_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_e"
-	file     = "../images/qgn_plat_view_button_e_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_e"
-	file     = "../images/qgn_plat_view_button_e.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_s"
-	file     = "../images/qgn_plat_view_button_s_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_s"
-	file     = "../images/qgn_plat_view_button_s_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_s"
-	file     = "../images/qgn_plat_view_button_s_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_s"
-	file     = "../images/qgn_plat_view_button_s_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_s"
-	file     = "../images/qgn_plat_view_button_s_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_s"
-	file     = "../images/qgn_plat_view_button_s.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_w"
-	file     = "../images/qgn_plat_view_button_w_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_w"
-	file     = "../images/qgn_plat_view_button_w_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_w"
-	file     = "../images/qgn_plat_view_button_w_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_w"
-	file     = "../images/qgn_plat_view_button_w_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_w"
-	file     = "../images/qgn_plat_view_button_w_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_w"
-	file     = "../images/qgn_plat_view_button_w.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_ne"
-	file     = "../images/qgn_plat_view_button_ne_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_ne"
-	file     = "../images/qgn_plat_view_button_ne_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_ne"
-	file     = "../images/qgn_plat_view_button_ne_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_ne"
-	file     = "../images/qgn_plat_view_button_ne_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_ne"
-	file     = "../images/qgn_plat_view_button_ne_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_ne"
-	file     = "../images/qgn_plat_view_button_ne.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_es"
-	file     = "../images/qgn_plat_view_button_es_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_es"
-	file     = "../images/qgn_plat_view_button_es_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_es"
-	file     = "../images/qgn_plat_view_button_es_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_es"
-	file     = "../images/qgn_plat_view_button_es_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_es"
-	file     = "../images/qgn_plat_view_button_es_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_es"
-	file     = "../images/qgn_plat_view_button_es.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_sw"
-	file     = "../images/qgn_plat_view_button_sw_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_sw"
-	file     = "../images/qgn_plat_view_button_sw_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_sw"
-	file     = "../images/qgn_plat_view_button_sw_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_sw"
-	file     = "../images/qgn_plat_view_button_sw_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_sw"
-	file     = "../images/qgn_plat_view_button_sw_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_sw"
-	file     = "../images/qgn_plat_view_button_sw.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_nw"
-	file     = "../images/qgn_plat_view_button_nw_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_nw"
-	file     = "../images/qgn_plat_view_button_nw_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_nw"
-	file     = "../images/qgn_plat_view_button_nw_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_nw"
-	file     = "../images/qgn_plat_view_button_nw_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_nw"
-	file     = "../images/qgn_plat_view_button_nw_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_nw"
-	file     = "../images/qgn_plat_view_button_nw.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_ns"
-	file     = "../images/qgn_plat_view_button_ns_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_ns"
-	file     = "../images/qgn_plat_view_button_ns_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_ns"
-	file     = "../images/qgn_plat_view_button_ns_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_ns"
-	file     = "../images/qgn_plat_view_button_ns_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_ns"
-	file     = "../images/qgn_plat_view_button_ns_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_ns"
-	file     = "../images/qgn_plat_view_button_ns.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_ew"
-	file     = "../images/qgn_plat_view_button_ew_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_ew"
-	file     = "../images/qgn_plat_view_button_ew_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_ew"
-	file     = "../images/qgn_plat_view_button_ew_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_ew"
-	file     = "../images/qgn_plat_view_button_ew_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_ew"
-	file     = "../images/qgn_plat_view_button_ew_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_ew"
-	file     = "../images/qgn_plat_view_button_ew.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_nes"
-	file     = "../images/qgn_plat_view_button_nes_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_nes"
-	file     = "../images/qgn_plat_view_button_nes_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_nes"
-	file     = "../images/qgn_plat_view_button_nes_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_nes"
-	file     = "../images/qgn_plat_view_button_nes_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_nes"
-	file     = "../images/qgn_plat_view_button_nes_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_nes"
-	file     = "../images/qgn_plat_view_button_nes.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_esw"
-	file     = "../images/qgn_plat_view_button_esw_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_esw"
-	file     = "../images/qgn_plat_view_button_esw_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_esw"
-	file     = "../images/qgn_plat_view_button_esw_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_esw"
-	file     = "../images/qgn_plat_view_button_esw_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_esw"
-	file     = "../images/qgn_plat_view_button_esw_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_esw"
-	file     = "../images/qgn_plat_view_button_esw.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_nsw"
-	file     = "../images/qgn_plat_view_button_nsw_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_nsw"
-	file     = "../images/qgn_plat_view_button_nsw_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_nsw"
-	file     = "../images/qgn_plat_view_button_nsw_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_nsw"
-	file     = "../images/qgn_plat_view_button_nsw_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_nsw"
-	file     = "../images/qgn_plat_view_button_nsw_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_nsw"
-	file     = "../images/qgn_plat_view_button_nsw.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_new"
-	file     = "../images/qgn_plat_view_button_new_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_new"
-	file     = "../images/qgn_plat_view_button_new_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_new"
-	file     = "../images/qgn_plat_view_button_new_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_new"
-	file     = "../images/qgn_plat_view_button_new_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_new"
-	file     = "../images/qgn_plat_view_button_new_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_new"
-	file     = "../images/qgn_plat_view_button_new.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-
-
-    image {
-        function = FOCUS
-	state    = ACTIVE
-	detail   = "osso_button_nesw"
-	file     = "../images/qgn_plat_view_button_nesw_pressed_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-	detail   = "osso_button_nesw"
-	file     = "../images/qgn_plat_view_button_nesw_focused.png"
-	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	shadow   = IN
-	detail	 = "osso_button_nesw"
-	file     = "../images/qgn_plat_view_button_nesw_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = SELECTED
-	detail	 = "osso_button_nesw"
-	file     = "../images/qgn_plat_view_button_nesw_pressed.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_nesw"
-	file     = "../images/qgn_plat_view_button_nesw_disabled.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_nesw"
-	file     = "../images/qgn_plat_view_button_nesw.png"
-  	border   = { 14, 14, 14, 14 }
-	stretch  = TRUE
-    }
-  }
-}
-class "GtkButton" style "osso-button"
-
-widget_class "*.GtkButton.GtkLabel" style "osso-ButtonFont"
-widget_class "*.GtkToggleButton.GtkLabel" style "osso-ButtonFont"
-
-#Style for Dialog buttons
-style "osso-dialogbutton" {
-
-  # The spec specifies the padding for the button and label. Button
-  # padding is specified in sapwoods. The following are for labels.
-  GtkButton::padding  = { 12, 12, 0, 0 }
- 
-  # Minimum width of the label is 60 pixels, thus the miminum width of
-  # the button is 100 pixels. Use value 90 here since additional 10
-  # pixels is added automagically somewhere in code
-  GtkButton::minimum_width  = 90
-
-  engine "sapwood" {
-
-    #######################
-    # Dialog buttons
-    #######################
-
-    image {
-	function = BOX
-	state    = ACTIVE
-	detail	 = "osso_button_ns"
-	file     = "../images/qgn_plat_dialog_button_middle_pressed.png"
- 	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_ns"
-	file     = "../images/qgn_plat_dialog_button_middle_disabled.png"
- 	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-    image {
-        function = BOX
-        state    = SELECTED
-        detail   = "osso_button_ns"
-        file     = "../images/qgn_plat_dialog_button_middle_focused.png"
-        border   = { 20, 20, 0, 0 }
-        stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_ns"
-	file     = "../images/qgn_plat_dialog_button_middle_normal.png"
-  	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-        state    = ACTIVE
-        detail   = "osso_button_ns"
-        file     = "../images/qgn_plat_dialog_button_middle_focused_pressed.png"
-        border   = { 20, 20, 0, 0}
-        stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-        detail   = "osso_button_ns"
-        file     = "../images/qgn_plat_dialog_button_middle_focused.png"
-        border   = { 20, 20, 0, 0 }
-        stretch  = TRUE
-    }
-  
-    image {
-        function = BOX
-        state    = ACTIVE
-	detail	 = "osso_button_nsw"
-	file     = "../images/qgn_plat_dialog_button_left_pressed.png"
-  	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_nsw"
-	file     = "../images/qgn_plat_dialog_button_left_disabled.png"
-  	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-    image {
-        function = BOX
-        state    = SELECTED
-        detail   = "osso_button_nsw"
-        file     = "../images/qgn_plat_dialog_button_left_focused.png"
-        border   = { 20, 20, 0, 0 }
-        stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_nsw"
-	file     = "../images/qgn_plat_dialog_button_left_normal.png"
-  	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-        state    = ACTIVE
-        detail   = "osso_button_nsw"
-        file     = "../images/qgn_plat_dialog_button_left_focused_pressed.png"
-        border   = { 20, 20, 0, 0 }
-        stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-        detail   = "osso_button_nsw"
-        file     = "../images/qgn_plat_dialog_button_left_focused.png"
-        border   = { 20, 20, 0, 0 }
-        stretch  = TRUE
-    }
-
-
-    image {
-	function = BOX
-	state    = ACTIVE
-	detail	 = "osso_button_nes"
-	file     = "../images/qgn_plat_dialog_button_right_pressed.png"
-  	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail	 = "osso_button_nes"
-	file     = "../images/qgn_plat_dialog_button_right_disabled.png"
-  	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-    image {
-        function = BOX
-        state    = SELECTED
-        detail   = "osso_button_nes"
-        file     = "../images/qgn_plat_dialog_button_right_focused.png"
-        border   = { 20, 20, 0, 0 }
-        stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail	 = "osso_button_nes"
-	file     = "../images/qgn_plat_dialog_button_right_normal.png"
-  	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-        state    = ACTIVE
-        detail   = "osso_button_nes"
-        file     = "../images/qgn_plat_dialog_button_right_focused_pressed.png"
-        border   = { 20, 20, 0, 0 }
-        stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-        detail   = "osso_button_nes"
-        file     = "../images/qgn_plat_dialog_button_right_focused.png"
-        border   = { 20, 20, 0, 0 }
-        stretch  = TRUE
-    }
-    
-    image {
-	function = BOX
-	state    = ACTIVE
-	detail   = "osso_button_nesw"
-	file     = "../images/qgn_plat_dialog_button_alone_pressed.png"
-  	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	state    = INSENSITIVE
-	detail   = "osso_button_nesw"
-	file     = "../images/qgn_plat_dialog_button_alone_disabled.png"
-  	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-    image {
-        function = BOX
-        state    = SELECTED
-        detail   = "osso_button_nesw"
-        file     = "../images/qgn_plat_dialog_button_alone_focused.png"
-        border   = { 20, 20, 0, 0 }
-        stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail   = "osso_button_nesw"
-	file     = "../images/qgn_plat_dialog_button_alone_normal.png"
-  	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-        state    = ACTIVE
-        detail   = "osso_button_nesw"
-        file     = "../images/qgn_plat_dialog_button_alone_focused_pressed.png"
-        border   = { 20, 20, 0, 0 }
-        stretch  = TRUE
-    }
-    image {
-        function = FOCUS
-        detail   = "osso_button_nesw"
-        file     = "../images/qgn_plat_dialog_button_alone_focused.png"
-        border   = { 20, 20, 0, 0 }
-        stretch  = TRUE
-    }
-  }
-}
-widget_class "*.GtkHButtonBox.GtkButton" style "osso-dialogbutton"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkbutton.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkbutton)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkbuttonbox
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkbuttonbox	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkbuttonbox	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,23 +0,0 @@
-#################################################### 
-# GTK HORIZONTAL BUTTON BOX
-#
-# Following style is for switching on hildon theming
-# for GtkHButtonBox. 
-# Assign this style to all GtkHbuttonBoxes 
-#################################################### 
-
-style "osso-hbuttonbox" {
-
-  GtkHButtonBox::hildonlike = 1
-  GtkHButtonBox::child_min_height = 47
-  GtkHButtonBox::child_min_width = 105
-}
-class "GtkHButtonBox" style "osso-hbuttonbox"
-
-style "osso-vbuttonbox" {
-
-  GtkVButtonBox::child_min_height = 47
-  GtkVButtonBox::child_min_width = 105
-
-}
-class "GtkVButtonBox" style "osso-vbuttonbox"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkbuttonbox.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkbuttonbox)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkcalendar
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkcalendar	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkcalendar	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,55 +0,0 @@
-####################################################
-# CALENDAR POPOUP (GTKCALENDAR)
-#
-# Copyright 2004,2005 Nokia Oyj
-#
-# Following style is for switching on osso theming
-# for GtkCalendar.
-# Assign this style to all GtkCalendars
-####################################################
-
-style "osso-calendar" = "osso-logical-colors"
-{
-  GtkCalendar::hildonlike = 1
-  GtkWidget::scroll-arrow-vlength = 26
-  GtkWidget::scroll-arrow-hlength = 26
-  xthickness = 0
-  ythickness = 0
-  text[SELECTED] = "DefaultTextColor"
-
-  engine "sapwood" {
-  
-    # Image used for indicating the current actual date  
-    image {
-      function = BOX
-      state = NORMAL
-      detail = "current-day"
-      file = "../images/qgn_plat_calendar_current_day_indicator.png"
-      stretch = TRUE
-      border = {4,4,4,4}
-    }
-    
-    # Image used for indicating the currently selected day
-    image {
-      function = BOX
-      state = NORMAL
-      detail = "active-day"
-      file = "../images/qgn_plat_calendar_active_day_indicator.png"
-      stretch = TRUE
-      border = {1,1,1,1}
-    }
-    
-    # Image used for indicating the current week in week number column
-    # and the current weekday in weekday list row.
-    image {
-      function = BOX
-      state = NORMAL
-      detail = "passive-focus"
-      file = "../images/qgn_plat_calendar_week_day_indicator.png"
-      stretch = TRUE
-      border = {2,2,2,2}
-    }
-  }
-}
-
-class "GtkCalendar" style "osso-calendar"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkcalendar.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkcalendar)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckbutton
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckbutton	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckbutton	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,153 +0,0 @@
-#################################################### 
-# GTK CHECKBUTTON
-#
-# Copyright 2004,2005 Nokia Oyj
-#
-# TODO : Check whether the focus is needed.
-#
-# This file has the themeing of check buttons.
-# The shadow IN or OUT state specifies whether
-# the check box is actually checked.
-#
-# Shadow ETCHED_IN state is used for indeterminate
-# check box state.
-#
-#################################################### 
-
-style "osso-checkbutton"
-{
-  GtkCheckButton::indicator-size = 26
-  GtkCheckButton::indicator-spacing = 2
-  
-  ythickness = 0
-
-  engine "sapwood"
-  {
-    image
-    {
-      function        = CHECK
-      shadow          = OUT
-      state           = NORMAL
-      overlay_file    = "../images/qgn_plat_check_box_empty_normal.png"
-      overlay_border  = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-    image
-    {
-      function        = CHECK
-      shadow          = IN
-      state           = NORMAL
-      overlay_file    = "../images/qgn_plat_check_box_selected_normal.png"
-      overlay_border  = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-    image
-    {
-      function        = CHECK
-      shadow          = OUT
-      state           = PRELIGHT
-      overlay_file    = "../images/qgn_plat_check_box_empty_normal.png"
-      overlay_border  = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-    image
-    {
-      function        = CHECK
-      shadow          = IN
-      state           = PRELIGHT
-      overlay_file    = "../images/qgn_plat_check_box_selected_normal.png"
-      overlay_border  = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-    image
-    {
-      function        = CHECK
-      shadow          = OUT
-      state           = ACTIVE
-      overlay_file    = "../images/qgn_plat_check_box_empty_focused.png"
-      overlay_border  = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-    image
-    {
-      function        = CHECK
-      shadow          = IN
-      state           = ACTIVE
-      overlay_file    = "../images/qgn_plat_check_box_selected_focused.png"
-      overlay_border  = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-    image
-    {
-      function        = CHECK
-      shadow          = OUT
-      state           = SELECTED
-      overlay_file    = "../images/qgn_plat_check_box_empty_focused.png"
-      overlay_border  = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-    image
-    {
-      function        = CHECK
-      shadow          = IN
-      state           = SELECTED
-      overlay_file    = "../images/qgn_plat_check_box_selected_focused.png"
-      overlay_border  = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-    image
-    {
-      function        = CHECK
-      shadow          = OUT
-      state           = INSENSITIVE
-      overlay_file    = "../images/qgn_plat_check_box_empty_disabled.png"
-      overlay_border  = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-    image
-    {
-      function        = CHECK
-      shadow          = IN
-      state           = INSENSITIVE
-      overlay_file    = "../images/qgn_plat_check_box_selected_disabled.png"
-      overlay_border  = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-    }
-    image
-    {
-      function        = CHECK
-      overlay_file    = "../images/qgn_plat_check_box_indeterminate_disabled.png"
-      overlay_border  = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-      shadow          = ETCHED_IN
-      state           = INSENSITIVE
-    }
-    image
-    {
-      function        = CHECK
-      overlay_file    = "../images/qgn_plat_check_box_indeterminate_normal.png"
-      overlay_border  = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-      shadow          = ETCHED_IN
-    }
-    image
-    {
-      function        = CHECK
-      overlay_file    = "../images/qgn_plat_check_box_indeterminate_focused.png"
-      overlay_border  = { 0, 0, 0, 0 }
-      overlay_stretch = TRUE
-      shadow          = ETCHED_IN
-      state= ACTIVE
-    }
-    image
-    {
-      function        = FOCUS
-      file    	       = "../images/qgn_plat_focus_active.png"
-      border  	       = { 2, 2, 2, 2 }
-      stretch 	       = TRUE
-    }
-  }
-}
-class "GtkCheckButton" style "osso-checkbutton"
-
-widget_class "*.GtkCheckButton.GtkLabel" style "osso-SystemFont"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckbutton.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckbutton)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckmenuitem
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckmenuitem	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckmenuitem	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,111 +0,0 @@
-#################################################### 
-# GTK CHECKMENUITEM
-#
-# Copyright 2004,2005 Nokia Oyj
-#
-# This file has the themeing of menu check marks
-# and the radio buttons when the property 
-# draw-as-radio is set. The radio button drawing is
-# also inherited to the GtkRadioMenuItem.
-# The shadow IN or OUT state specifies whether
-# the check box is actually checked.
-#
-#################################################### 
-
-style "osso-menucheck"
-{
-
-  GtkCheckMenuItem::indicator_size = 26
-  engine "sapwood"
-  {
-    image
-      {
-        function        = CHECK
-	shadow          = IN
-	state           = INSENSITIVE
-	overlay_file    = "../images/qgn_plat_menu_check_mark_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = CHECK
-	shadow          = IN
-	state           = ACTIVE
-	overlay_file    = "../images/qgn_plat_menu_check_mark_focus.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = CHECK
-	shadow          = IN
-	state           = PRELIGHT
-	overlay_file    = "../images/qgn_plat_menu_check_mark_focus.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = CHECK
-	shadow          = IN
-	state           = SELECTED
-	overlay_file    = "../images/qgn_plat_menu_check_mark_focus.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = CHECK
-	shadow          = IN
-	overlay_file    = "../images/qgn_plat_menu_check_mark_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = OPTION
-	shadow          = IN
-	state           = INSENSITIVE
-	overlay_file    = "../images/qgn_plat_menu_button_radio_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = OPTION
-	shadow          = IN
-	state           = ACTIVE
-	overlay_file    = "../images/qgn_plat_menu_button_radio_focus.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = OPTION
-	shadow          = IN
-	state           = PRELIGHT
-	overlay_file    = "../images/qgn_plat_menu_button_radio_focus.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = OPTION
-	shadow          = IN
-	state           = SELECTED
-	overlay_file    = "../images/qgn_plat_menu_button_radio_focus.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = OPTION
-	shadow          = IN
-	overlay_file    = "../images/qgn_plat_menu_button_radio_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-  }
-}
-class "GtkCheckMenuItem" style "osso-menucheck"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckmenuitem.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkcheckmenuitem)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkcombobox
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkcombobox	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkcombobox	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,253 +0,0 @@
-####################################################  
-# GTK COMBO BOX (ComboBox and ComboBoxEntry)
-#
-# Copyright 2004, 2005, 2006 Nokia Oyj
-#
-# This file has the themeing of comboboxes.
-#
-# The combobox only allows selection, not edition,
-# is named GtkComboBox and is actually just one big 
-# GtkButton that has text inside it. Therefore one 
-# image per state is enough for it.  
-#
-# The combobox version that allows editing of the text
-# is named GtkComboBoxEntry and consists of two parts:
-# A GtkButton and GtkEntry. These have to be themed
-# separately.
-#
-# Additionally, when a combobox is in a toolbar,
-# it will use different graphics that show the arrow
-# pointing upwards.
-#
-#################################################### 
-
-style "osso-combobox-base" {
-
-  GtkWidget::focus-line-width = 0
-  GtkWidget::focus-padding = 0
-  GtkWidget::focus-line-pattern = "\0\0\0\0\0\0\0\0"
-  GtkComboBox::hildonlike = 1
-  GtkComboBox::arrow-width = 26
-  GtkComboBox::arrow-height = 30
-  GtkComboBox::minimum-width = 150
-  GtkComboBox::autodimmed_button = 1
-  GtkComboBox::appears-as-list = 1
-
-}
-class "GtkComboBox" style "osso-combobox-base"
-
-###################################################
-#
-# Styles for non-entry ComboBox
-#
-###################################################
-
-style "osso-combobox-button" {
-  GtkToggleButton::hildonlike = 1
-    engine "sapwood" {
-
-        image {
-            function = FOCUS
-        }
-        image {
-            function = BOX
-            file = "../images/qgn_plat_combobox_button_disabled.png"
-            state = INSENSITIVE
-            border = { 0, 0, 0, 0 }
-            stretch = TRUE
-        }
-        image {
-            function = BOX
-            file = "../images/qgn_plat_combobox_button_pressed.png"
-            state = ACTIVE
-            border = { 0, 0, 0, 0 }
-            stretch = TRUE
-        }
-        image {
-            function = BOX
-            file = "../images/qgn_plat_combobox_button_normal.png"
-            border = { 0, 0, 0, 0 }
-            stretch = TRUE
-        }
-        image {
-            function = TAB
-        }
-    }
-}
-widget_class "*.GtkComboBox.GtkToggleButton" style "osso-combobox-button"
-
-
-style "osso-combobox-frame" {
-
-   # GtkFrame::hildonlike = 1
-    ythickness = 1
-
-    engine "sapwood" {
-
-        image {
-            function = FOCUS
-        }
-        image {
-            function = BOX
-            file = "../images/qgn_plat_combobox_frame_disabled.png"
-            state = INSENSITIVE
-            border = { 2, 2, 0, 0 }
-            stretch = TRUE
-        }
-        image {
-            function = BOX
-            file = "../images/qgn_plat_combobox_frame_normal.png"
-            border = { 2, 2, 0, 0 }
-            stretch = TRUE
-        }
-    }
-}
-widget_class "*.GtkComboBox.GtkFrame" style "osso-combobox-frame"
-
-
-###################################################
-#
-# Styles for ComboBoxEntry
-#
-###################################################
-
-# We have a base style for combobox-entry too, because we
-# might have a different looking search combobox.
-
-style "osso-combobox-entry-base" {
-
-  GtkEntry::hildonlike = 1
-  GtkEntry::horizontal-border = 4
-  GtkEntry::vertical-border = 0
-  GtkEntry::show-last-char = 1
-
-  GtkEntry::icon_width = 0
-}
-widget_class "*.GtkComboBoxEntry.GtkEntry" style "osso-combobox-entry-base"
-
-# We don't need gtk+ to draw it's arrow. The button drawing is enough for us.
-
-style "osso-combobox-entry-arrow"
-{
-	engine "sapwood" {
-		image {
-			function = ARROW
-		}
-	}
-}
-widget_class "*.GtkComboBox.GtkToggleButton.GtkArrow" style "osso-combobox-entry-arrow"
-widget_class "*.GtkComboBoxEntry.GtkToggleButton.GtkArrow" style "osso-combobox-entry-arrow"
-
-
-style "osso-combobox-entry-entry" {
-
-  engine "sapwood"
-    {
-      image
-        {
-	  function = BOX
-	  state    = INSENSITIVE
-  	  file = "../images/qgn_plat_listbox_border_with_icon_disabled.png"
-	  border   = { 2, 2, 0, 0 }
-	  stretch  = TRUE
-	}
-      image
-        {
-	  function = BOX
-  	  file = "../images/qgn_plat_listbox_border_with_icon_normal.png"
-	  border   = { 2, 2, 0, 0 }
-	  stretch  = TRUE
-	}
-    }
-}
-
-widget_class "*.GtkComboBoxEntry.GtkEntry" style  "osso-combobox-entry-entry"
-
-style "osso-combobox-entry-button-down" {
-
-	engine "sapwood" {
-		image {
-			function = FOCUS
-			file = "../images/qgn_plat_listbox_arrow_down_pressed.png"
-			state = ACTIVE
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = FOCUS
-			file = "../images/qgn_plat_listbox_arrow_down_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			file = "../images/qgn_plat_listbox_arrow_down_disabled.png"
-			state = INSENSITIVE
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			file = "../images/qgn_plat_listbox_arrow_down_pressed.png"
-			state = ACTIVE
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			file = "../images/qgn_plat_listbox_arrow_down_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = TAB
-		}
-	}
-}
-widget_class "*.GtkComboBoxEntry.GtkToggleButton" style "osso-combobox-entry-button-down"
-
-# Different themeing to combobox when it's in a toolbar. In this case the
-# arrow points upwards.
-style "osso-combobox-entry-button-up" {
-
-	engine "sapwood" {
-		image {
-			function = FOCUS
-			file = "../images/qgn_plat_listbox_arrow_up_pressed.png"
-			state = ACTIVE
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = FOCUS
-			file = "../images/qgn_plat_listbox_arrow_up_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			file = "../images/qgn_plat_listbox_arrow_up_disabled.png"
-			state = INSENSITIVE
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			file = "../images/qgn_plat_listbox_arrow_up_pressed.png"
-			state = ACTIVE
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			file = "../images/qgn_plat_listbox_arrow_up_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = TAB
-		}
-	}
-
-}
-widget_class "*.GtkToolbar.GtkComboBoxEntry.GtkToggleButton" style "osso-combobox-entry-button-up"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkcombobox.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkcombobox)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkdialog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkdialog	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkdialog	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,38 +0,0 @@
-#################################################### 
-# GTK DIALOG
-#
-# Copyright 2004,2005 Nokia Oyj
-#
-# Theming instructions for GtkDialog -widget
-#
-# The outer border/frame graphics are themed in matchbox
-# theme files located in ../matchbox/*
-#
-# Only change is setting the button spacing to 5
-# pixels.
-#
-#################################################### 
-
-style "osso-multipage-dialog" {
-  GtkDialog::button_spacing = 6
-  GtkDialog::content_area_border = 6
-  GtkDialog::content_area_spacing = 18
-  GtkDialog::action_area_border = 0
-  GtkDialog::extended_left_border = 0
-  GtkDialog::extended_right_border = 0
-  GtkNotebook::inner_left_border = 12
-  GtkNotebook::inner_right_border = 12
-}
-
-widget_class "GtkDialog.GtkVBox.GtkNotebook" style "osso-multipage-dialog"
-
-style "osso-dialog" {
-  GtkDialog::button_spacing = 6
-#  GtkDialog::content_area_border = 10
-  GtkDialog::content_area_border = 0
-  GtkDialog::action_area_border = 10
-  GtkDialog::extended_left_border = 0
-  GtkDialog::extended_right_border = 0
-}
-
-class "GtkDialog" style "osso-dialog"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkdialog.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkdialog)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkentry
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkentry	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkentry	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,36 +0,0 @@
-#################################################### 
-# GTK ENTRY (Single line editor)
-#
-# Copyright 2004,2005 Nokia Oyj
-#
-# The GtkEntry (single line editor) is themed here.
-#
-#################################################### 
-
-style "osso-entry" {
-
-	GtkEntry::hildonlike = 1
-	GtkEntry::horizontal-border = 6
-	GtkEntry::vertical-border = 0
-	GtkEntry::show-last-char = 1
-	
-	engine "sapwood" {
-		image {
-			function = BOX
-			state = INSENSITIVE
-			file = "../images/qgn_plat_single_line_input_disabled.png"
-			border = { 2, 2, 2, 2 }
-			stretch = TRUE
-		}
-	}
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			file = "../images/qgn_plat_single_line_input.png"
-			border = { 2, 2, 2, 2 }
-			stretch = TRUE
-		}
-	}
-}
-class "GtkEntry" style "osso-entry"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkentry.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkentry)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkentrycompletion
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkentrycompletion	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkentrycompletion	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,38 +0,0 @@
-#################################################### 
-# GTK ENTRY COMPLETION
-#
-# Copyright 2006 Nokia Oyj
-#
-# The GtkEntryCompletion is themed here
-#
-#################################################### 
-
-style "osso-completion-frame"
-{
-  GtkFrame::hildonlike = 1
-
-  xthickness = 6
-  ythickness = 6
-
-  engine "sapwood"
-    {
-      # Not quite sure if INSENSITIVE is and option for this widget
-      image
-        {
-	  function = BOX
-	  state    = INSENSITIVE
-	  file     = "../images/qgn_plat_frame_disabled.png"
-	  border   = { 3, 3, 3, 3 }
-	  stretch  = TRUE
-	}
-      image
-        {
-	  function = BOX
-	  file     = "../images/qgn_plat_frame.png"
-	  border   = { 3, 3, 3, 3 }
-	  stretch  = TRUE
-	}
-    }
-}
-
-widget "hildon-completion-window.GtkFrame" style "osso-completion-frame"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkentrycompletion.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkentrycompletion)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkexpander
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkexpander	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkexpander	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,77 +0,0 @@
-#################################################### 
-# GTK EXPANDER
-#
-# Copyright 2006 Nokia Oyj
-#
-# The GtkExpander is themed here
-#
-#################################################### 
-
-style "osso-expander" {
-
-  GtkExpander::expander-spacing = 6
-  GtkExpander::expander-size = 26
-
-  ythickness = 0
-  xthickness = 0
-
-  engine "sapwood" {	
-    image {
-    	function = ARROW
-    	state = PRELIGHT
-        detail = "expander"
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_arrow_expander_focused.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-    }
-    image {
-    	function = ARROW
-    	state = PRELIGHT
-        detail = "expander"
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_arrow_expander_down_focused.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-    }
-    image {
-    	function = ARROW
-    	state = NORMAL
-        detail = "expander"
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_arrow_expander_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-    }
-    image {
-    	function = ARROW
-    	state = NORMAL
-        detail = "expander"
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_arrow_expander_down_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-    }
-    image {
-    	function = ARROW
-    	state = INSENSITIVE
-        detail = "expander"
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_arrow_expander_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-    }
-    image {
-    	function = ARROW
-    	state = INSENSITIVE
-        detail = "expander"
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_arrow_expander_down_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-    }
-  }
-
-}
-
-class "GtkExpander" style "osso-expander"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkexpander.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkexpander)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkfilechooserbutton
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkfilechooserbutton	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkfilechooserbutton	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,72 +0,0 @@
-#################################################### 
-# GTK FILE CHOOSER BUTTON
-#
-# Copyright 2006 Nokia Oyj
-#
-# The GtkFileChooserButton is themed here
-#
-#################################################### 
-
-style "osso-filechooserbutton" {
-
-    GtkFileChooserButton::hildonlike = 1
-}
-
-class "GtkFileChooserButton" style "osso-filechooserbutton"
-
-style "osso-filechooserbutton-button" {
-
-    GtkFileChooserButton::hildonlike = 1
-
-    # file chooser button
-    engine "sapwood" {
-      image {
-          function = FOCUS
-          state    = ACTIVE
-    	  detail   = "buttondefault"
-  	  file = "../images/qgn_plat_single_line_input.png"
-  	  border   = { 2, 2, 2, 2 }
-  	  stretch  = TRUE
-      }
-      image {
-          function = FOCUS
-	  detail   = "buttondefault"
-  	  file = "../images/qgn_plat_single_line_input.png"
-	  border   = { 2, 2, 2, 2 }
-	  stretch  = TRUE
-      }
-      image {
-          function = BOX
-	  shadow   = IN
-	  detail   = "buttondefault"
-	  file = "../images/qgn_plat_single_line_input.png"
-	  border   = { 2, 2, 2, 2 }
-	  stretch  = TRUE
-      }
-      image {
-          function = BOX
-	  state    = SELECTED
-	  detail   = "buttondefault"
-	  file = "../images/qgn_plat_single_line_input.png"
-	  border   = { 2, 2, 2, 2 }
-	  stretch  = TRUE
-      }
-      image {
-          function = BOX
-	  state    = INSENSITIVE
-	  detail   = "buttondefault"
-	  file = "../images/qgn_plat_single_line_input.png"
-	  border   = { 2, 2, 2, 2 }
-	  stretch  = TRUE
-      }
-      image {
-	  function = BOX
-	  detail   = "buttondefault"
-	  file = "../images/qgn_plat_single_line_input.png"
-	  border   = { 2, 2, 2, 2 }
-	  stretch  = TRUE
-      }
-    }
-}
-
-widget_class "*.GtkFileChooserButton.GtkButton" style "osso-filechooserbutton-button"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkfilechooserbutton.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkfilechooserbutton)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkframe
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkframe	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkframe	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,39 +0,0 @@
-####################################################  
-# GTK FRAME
-#
-# Copyright 2005 Nokia Oyj
-#
-# This file has the themeing of frames.
-# Normal gtk doesn't have themeable, graphical frames
-# so this modification was done to allow it.
-#
-#################################################### 
-
-style "osso-frame"
-{
-  GtkFrame::hildonlike = 1
-  
-  xthickness = 3
-  ythickness = 3
-  
-  engine "sapwood"
-    {
-      image
-        {
-	  function = BOX
-	  state    = INSENSITIVE
-	  file     = "../images/qgn_plat_frame_disabled.png"
-	  border   = { 3, 3, 3, 3 }
-	  stretch  = TRUE
-	}
-      image
-        {
-	  function = BOX
-	  file     = "../images/qgn_plat_frame.png"
-	  border   = { 3, 3, 3, 3 }
-	  stretch  = TRUE
-	}
-    }
-}
-
-class "GtkFrame" style "osso-frame"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkframe.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkframe)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenu
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenu	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenu	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,231 +0,0 @@
-#################################################### 
-# GTK MENU (Menu)
-#
-# Copyright 2004,2005 Nokia Oyj
-#
-# The Menu is themed here. This file only themes
-# the menu frames. The menu items and their
-# variations are themed in separate *menuitem 
-# rc files.
-#
-# There is possibility to have 3 different menu
-# frame graphics depending on the situtation :
-#  - Application menu. This may have sharp upper
-#    corners to show that
-#
-#
-# In osso menus look a bit different depending on 
-# how they were activated. We need three different
-# styles for GtkMenu widget
-# o One with no osso specific theming (failsafe)
-# o One with rectangular upper corners
-# o One with round corners
-#
-# TODO: 
-# Styles are not using right images yet!
-#################################################### 
-
-style "osso-menu" {
-
-   GtkMenu::horizontal_padding = 18
-   GtkMenu::vertical_padding = 18
-
-   GtkMenu::hildonlike = 1
-   GtkMenu::double_arrows = 1
-   
-   engine "sapwood" {
-      image {
-	 function = BOX
-	 state = NORMAL
-	 detail = "menu"
-	 file = "../images/qgn_plat_application_menu_lower_level_frame.png"
-	 border = { 20, 20, 20, 20 }
-	 stretch = TRUE
-     shaped = TRUE
-      }
-    image
-      {
-        function        = ARROW
-	state           = ACTIVE
-	arrow_direction = UP
-	overlay_file    = "../images/qgn_plat_menu_scroll_up_arrow_pressed.png"
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	state           = INSENSITIVE
-	arrow_direction = UP
-	overlay_file    = "../images/qgn_plat_menu_scroll_up_arrow_disabled.png"
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	arrow_direction = UP
-	overlay_file    = "../images/qgn_plat_menu_scroll_up_arrow_normal.png"
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	state           = ACTIVE
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_menu_scroll_down_arrow_pressed.png"
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	state           = INSENSITIVE
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_menu_scroll_down_arrow_disabled.png"
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_menu_scroll_down_arrow_normal.png"
-	overlay_stretch = FALSE
-      }
-   }
-}
-
-style "osso-menu-with-corners" {
-
-   GtkMenu::horizontal_padding = 18
-   GtkMenu::vertical_padding = 18
-
-   engine "sapwood" {
-      image {
-	  function = BOX
-	  state = NORMAL
-	  detail = "menu"
-	  file = "../images/qgn_plat_application_menu_1st_level_frame.png"
-	  border = { 20, 20, 20, 20 }
-	  stretch = TRUE
-      shaped = TRUE
-      }
-   }
-}
-
-style "osso-menu-without-corners" {
-
-   GtkMenu::horizontal_padding = 18
-   GtkMenu::vertical_padding = 18
-
-   engine "sapwood" {
-      image {
-	 function = BOX
-	 state = NORMAL
-	 detail = "menu"
-	 file = "../images/qgn_plat_application_menu_lower_level_frame.png"
-	 border = { 20, 20, 20, 20 }
-	 stretch = TRUE
-     shaped = TRUE
-      }
-   }
-}
-
-style "osso-menu-from-navigator" {
-
-   GtkMenu::horizontal_padding = 18
-   GtkMenu::vertical_padding = 18
-
-   engine "sapwood" {
-      image {
-	 function = BOX
-	 state = NORMAL
-	 detail = "menu"
-	 file = "../images/qgn_plat_task_navigation_menu_frame.png"
-	 border = { 20, 20, 20, 20 }
-	 stretch = TRUE
-     shaped = TRUE
-      }
-  }
-}
-
-
-
-style "osso-menu-from-navigator-thumb" {
-
-   GtkMenu::horizontal_padding = 18
-   GtkMenu::vertical_padding = 18
-
-   GtkWidget::scroll-arrow-vlength = 58
-
-   engine "sapwood" {
-      image {
-	    function = BOX
-	    state = NORMAL
-	    detail = "menu"
-	    file = "../images/qgn_plat_task_navigation_menu_frame.png"
-	    border = { 20, 20, 20, 20 }
-	    stretch = TRUE
-        shaped = TRUE
-      }
-
-    image
-      {
-        function        = ARROW
-        state           = ACTIVE
-        arrow_direction = UP
-        overlay_file    = "../images/qgn_plat_thumb_menu_scroll_up_arrow_pressed.png"
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-        state           = INSENSITIVE
-        arrow_direction = UP
-        overlay_file    = "../images/qgn_plat_thumb_menu_scroll_up_arrow_disabled.png"
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-        arrow_direction = UP
-        overlay_file    = "../images/qgn_plat_thumb_menu_scroll_up_arrow_normal.png"
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-        state           = ACTIVE
-        arrow_direction = DOWN
-        overlay_file    = "../images/qgn_plat_thumb_menu_scroll_down_arrow_pressed.png"
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-        state           = INSENSITIVE
-        arrow_direction = DOWN
-        overlay_file    = "../images/qgn_plat_thumb_menu_scroll_down_arrow_disabled.png"
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-        arrow_direction = DOWN
-        overlay_file    = "../images/qgn_plat_thumb_menu_scroll_down_arrow_normal.png"
-        overlay_stretch = FALSE
-      }
-   }
-}
-
-
-
-class "GtkMenu" style "osso-menu"
-widget "*.menu_with_corners" style "osso-menu-with-corners"
-widget "*.menu_without_corners" style "osso-menu-without-corners"
-widget "*.menu_force_with_corners" style "osso-menu-with-corners"
-widget "*.menu_force_without_corners" style "osso-menu-without-corners"
-widget "*.menu_without_corners_first_level" style "osso-menu-without-corners"
-widget "*.menu_combobox" style "osso-menu-without-corners"
-
-widget "hildon-menu-window-normal.*" style "osso-menu-from-navigator"
-widget "hildon-menu-window-thumb.*" style "osso-menu-from-navigator-thumb"
-widget "*.menu_from_navigator" style "osso-menu-from-navigator"
-widget "*.menu_from_navigator_thumb" style "osso-menu-from-navigator-thumb"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenu.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenu)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenuitem
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenuitem	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenuitem	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,73 +0,0 @@
-#################################################### 
-# GTK MENUITEM
-#
-#################################################### 
-
-style "osso-menuitem"
-{
-
-  GtkMenuItem::include_arrow_in_focus = 0
-  GtkMenuItem::hildonlike = 1
-  GtkMenuItem::separator_height = 3
-
-  engine "sapwood"
-  {
-    # Image for passive focus.
-    image
-      {
-	function = BOX
-	state = SELECTED
-	file = "../images/qgn_plat_focus_passive.png"
-	border = { 2, 2, 2, 2 }
-	stretch = TRUE
-      }
-    
-    # Image for active focus.
-    image
-      {
-	function = BOX
-	state = PRELIGHT
-        file = "../images/qgn_plat_focus_active.png"
-        border = { 2, 2, 2, 2 }
-	stretch = TRUE
-      }
-    
-    image
-      {
-        function        = ARROW
-        arrow_direction = RIGHT
-        state           = INSENSITIVE
-        overlay_file    = "../images/qgn_plat_menu_next_level_arrow_disabled.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-	arrow_direction = RIGHT
-	shadow          = OUT
-	overlay_file    = "../images/qgn_plat_menu_next_level_arrow_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-        arrow_direction = RIGHT
-        shadow          = IN
-        overlay_file    = "../images/qgn_plat_menu_next_level_arrow_pressed.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }
-     image
-      {
-        function        = BOX
-	detail          = "separator"
-        file            = "../images/qgn_plat_separator_horizontal.png"
-        border          = { 12, 12, 0, 0 }
-        stretch         = TRUE
-      }
-  }		  
-}
-
-class "GtkMenuItem" style "osso-menuitem"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenuitem.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenuitem)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenutoolbutton
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenutoolbutton	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenutoolbutton	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,65 +0,0 @@
-####################################################
-# GTK MENU TOOL BUTTON
-#
-# Copyright 2006 Nokia Oyj
-#
-# This file has the themeing of toolbar's menu
-# button.
-#
-# The choicelist version of combobox which only
-# allows selection, not edition is named GtkComboBox
-# and is actually just one big GtkButton that has text
-# inside it. Therefore one image per state is enough
-# for it.
-#
-# The combobox version that allows editing of the text
-# is named GtkComboBoxEntry and consists of two parts:
-# A GtkButton and GtkEntry. These have to be themed
-# separately.
-#
-# Additionally, when a combobox is in a toolbar,
-# it will use different graphics that show the arrow
-# pointing upwards.
-#
-####################################################
-
-
-####################################################
-#
-# Style for the menutoolbuttonarrow
-#
-####################################################
-
-style "osso-menutoolbuttonarrow" {
-
-    engine "sapwood" {
-        image {
-            function = FOCUS
-            file = "../images/qgn_plat_toolbar_menu_button_pressed.png"
-            state = ACTIVE
-        }
-        image {
-            function = FOCUS
-            file = "../images/qgn_plat_toolbar_menu_button_normal.png"
-        }
-        image {
-            function = BOX
-            file = "../images/qgn_plat_toolbar_menu_button_disabled.png"
-            state = INSENSITIVE
-        }
-        image {
-            function = BOX
-            file = "../images/qgn_plat_toolbar_menu_button_pressed.png"
-            state = ACTIVE
-        }
-        image {
-            function = BOX
-            file = "../images/qgn_plat_toolbar_menu_button_normal.png"
-        }
-        image {
-            function = TAB
-        }
-    }
-}
-
-widget "*.GtkMenuToolButton.GtkHBox.GtkToggleButton.GtkArrow" style "osso-menutoolbuttonarrow"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenutoolbutton.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkmenutoolbutton)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtknotebook
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtknotebook	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtknotebook	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,127 +0,0 @@
-#################################################### 
-# GTK NOTEBOOK (Multipage stuff)
-#
-# Copyright 2004,2005 Nokia Oyj
-#
-# BOX_GAP functions is used to draw the image for
-# the opened page frame. This has two possible
-# detail fields - "notebook" and "notebook_show_arrow".
-# The "notebook" is used when the arrows to cycle
-# through the tabs are not present and
-# "notebook_show_arrow" is used when they are present.
-#
-#################################################### 
-
-# Tabbed windows
-style "osso-notebook"
-{
-  GtkNotebook::inner_left_border = 0
-  GtkNotebook::inner_right_border = 0
-  GtkNotebook::tab-overlap = 0
-  GtkNotebook::arrow-spacing = 6
-  GtkNotebook::label-padding = 12
-  GtkWidget::scroll-arrow-hlength = 20
-  GtkWidget::scroll-arrow-vlength = 30
-
-  # Themings for images on different sides of the notebook.
-  engine "sapwood"
-  {
-    # Top theming.
-    image 
-      {
-        function = EXTENSION
-	state    = ACTIVE
-	file     = "../images/qgn_plat_notebook_tab_passive.png"
-	border   = { 12, 12, 0, 0 }
-	stretch  = TRUE
-	gap_side = BOTTOM
-      }
-    image
-      {
-        function = EXTENSION
-	file     = "../images/qgn_plat_notebook_tab_active.png"
-	border   = { 12, 12, 0, 0 }
-	stretch  = TRUE
-	gap_side = BOTTOM
-      }
-    # Content area theming when arrows are not present.
-    image
-      {
-        function = BOX_GAP
-	detail   = "notebook"
-        file     = "../images/qgn_plat_notebook_tab_area_border.png"
-        border   = { 10, 10, 0, 20 }
-        stretch  = TRUE
-      }
-    # Content area theming when arrows are present.
-    image
-      {
-        function = BOX_GAP
-	detail   = "notebook_show_arrow"
-        file     = "../images/qgn_plat_notebook_tab_area_border_arrow_space.png"
-        border   = { 38, 38, 10, 10 }
-        stretch  = TRUE
-      }
-      
-    # Arrows left
-    image
-      {
-        function        = ARROW
-        state           = INSENSITIVE
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_notebook_button_previous_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-        shadow          = IN
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_notebook_button_previous_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-        shadow          = OUT
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_notebook_button_previous.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    
-    # Arrows right
-    image
-      {
-        function        = ARROW
-        state           = INSENSITIVE
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_notebook_button_next_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-        shadow          = IN
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_notebook_button_next_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = ARROW
-        shadow          = OUT
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_notebook_button_next.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-  }
-}
-class "GtkNotebook" style "osso-notebook"
-
-widget_class "*.GtkNotebook.GtkLabel" style "osso-ButtonFont"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtknotebook.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtknotebook)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkpaned
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkpaned	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkpaned	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,39 +0,0 @@
-#################################################### 
-# GTK PANED
-#
-# Copyright 2006 Nokia Oyj
-#
-# The GtkPaned is themed here
-#
-#################################################### 
-
-style "osso-paned"  = "osso-logical-colors" {
-
-    bg[NORMAL] = "PaintedBackgrdColor"  
-    bg[PRELIGHT] = "PaintedBackgrdColor"  
-    GtkPaned::handle_size = 10
-
-    engine "sapwood"
-    {
-        image
-        {
-            function    = HANDLE
-            file        = "../images/qgn_plat_separator_vertical_paned.png"
-            overlay_file= "../images/qgn_plat_separator_vertical_paned_thumb.png"
-            orientation = VERTICAL
-            border      = {0,0,12,12}
-            overlay_stretch = FALSE
-        }
-        image
-        {
-            function    = HANDLE
-            file        = "../images/qgn_plat_separator_horizontal_paned.png"
-            overlay_file= "../images/qgn_plat_separator_horizontal_paned_thumb.png"
-            orientation = HORIZONTAL
-            border      = {12,12,0,0}
-            overlay_stretch = FALSE
-        }
-    }
-}
-
-class "GtkPaned" style "osso-paned"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkpaned.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkpaned)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkprogressbar
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkprogressbar	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkprogressbar	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,47 +0,0 @@
-#################################################### 
-# GTK PROGRESSBAR
-#
-#################################################### 
-
-style "osso-progressbar" = "osso-logical-colors"
-{
-  xthickness = 2
-  ythickness = 3
-  GtkProgressBar::width-increment = 0
-  GtkProgressBar::height-increment = 0
-  GtkProgressBar::text-spacing = -2
-  GtkProgressBar::text-xnudge = 0
-  GtkProgressBar::text-ynudge = 0
-  
-  fg[NORMAL] = "ProgressTextColor1"
-  fg[PRELIGHT] = "ProgressTextColor2"
-  
-  engine "sapwood"
-  {
-    image
-      {
-	function = BOX
-	detail = "bar"
-	file = "../images/qgn_plat_progress_bar_gradient.png"
-	border = { 0, 0, 0, 0 }
-	stretch = TRUE
-      }
-    image 
-      {	
-	function = BOX
-	detail = "trough"
-	file = "../images/qgn_plat_progress_bar_border.png"
-	border = { 4, 4, 0, 0 }
-	stretch = TRUE
-
-	# If orientation is set to HORIZONTAL, then the box will not be
-	# drawn if HEIGHT > WIDTH
-	# If orientation is set to VERTICAL, then the box will not be
-	# dranw if HEIGHT < WIDTH
-	# Hence: do not set orientation to anything :-)
-	# Fixes bug #447 and #413
-      }
-  }
-}
-
-class "GtkProgressBar" style "osso-progressbar"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkprogressbar.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkprogressbar)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkradiobutton
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkradiobutton	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkradiobutton	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,91 +0,0 @@
-#################################################### 
-# GTK RADIOBUTTON
-#
-#################################################### 
-	
-style "osso-radiobutton"
-{
-  GtkCheckButton::indicator-size = 26
-  GtkCheckButton::indicator-spacing = 2
-  
-  ythickness = 0
-
-  engine "sapwood"
-  {
-    image
-      {
-        function        = OPTION
-	shadow          = OUT
-	state           = NORMAL
-	overlay_file    = "../images/qgn_plat_button_radio_empty_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-       function        = OPTION
-	shadow          = IN
-	state           = NORMAL
-	overlay_file    = "../images/qgn_plat_button_radio_selected_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = OPTION
-	shadow          = OUT
-	state           = PRELIGHT
-	overlay_file    = "../images/qgn_plat_button_radio_empty_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = OPTION
-	shadow          = IN
-	state           = PRELIGHT
-	overlay_file    = "../images/qgn_plat_button_radio_selected_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = OPTION
-	shadow          = OUT
-	state           = ACTIVE
-	overlay_file    = "../images/qgn_plat_button_radio_empty_focused.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = OPTION
-	shadow          = IN
-	state           = ACTIVE
-	overlay_file    = "../images/qgn_plat_button_radio_selected_focused.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = OPTION
-	shadow          = OUT
-	state           = INSENSITIVE
-	overlay_file    = "../images/qgn_plat_button_radio_empty_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image 
-      {
-        function        = OPTION
-	shadow          = IN
-	state           = INSENSITIVE
-	overlay_file    = "../images/qgn_plat_button_radio_selected_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-  }
-}
-class "GtkRadioButton" style "osso-radiobutton"
-
-widget_class "*.GtkRadioButton.GtkLabel" style "osso-SystemFont"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkradiobutton.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkradiobutton)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkrange
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkrange	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkrange	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,94 +0,0 @@
-#################################################### 
-# GTK RANGE
-#
-#################################################### 
-
-style "osso-range"
-{
-# Not sure what these two change, so I'm leaving them out.
-#  GtkRange::slider_width = 16
-#  GtkRange::stepper_size = 16
-
-  # Alignment in entry box. 0 = left, 1 = right
-  GtkRange::hildon_range_editor_entry_alignment = 1
-  # Amount of padding to add to each side of the separator
-  GtkRange::hildon_range_editor_separator_padding = 6
-  
-  engine "sapwood"
-  {
-    # Vertical
-    image
-      {
-        function        = BOX
-	orientation     = VERTICAL
-	state		= INSENSITIVE
-	file            = "../images/qgn_plat_scroll_vertical_shaft_disabled.png"
-	border          = { 0, 0, 0, 0 }
-	stretch         = TRUE
-      }
-    image
-      {
-        function        = SLIDER
-	orientation     = VERTICAL
-	state		= INSENSITIVE
-	file            = "../images/qgn_plat_scroll_vertical_thumb_disabled.png"
-	border		= { 0, 0, 10, 10 }
-	stretch         = TRUE
-      }
-    image
-      {
-        function        = BOX
-	orientation     = VERTICAL
-	file            = "../images/qgn_plat_scroll_vertical_shaft_normal.png"
-	border          = { 0, 0, 0, 0 }
-	stretch         = TRUE
-      }
-    image
-      {
-        function        = SLIDER
-	orientation     = VERTICAL
-	file            = "../images/qgn_plat_scroll_vertical_thumb_normal.png"
-	border		= { 0, 0, 10, 10 }
-	stretch         = TRUE
-      }
-    
-    # Horizontal
-    image
-      {
-        function        = BOX
-	orientation     = HORIZONTAL
-	state		= INSENSITIVE
-	file            = "../images/qgn_plat_scroll_horizontal_shaft_disabled.png"
-	border          = { 0, 0, 0, 0 }
-	stretch         = TRUE
-      }
-    image 
-      {
-        function        = SLIDER
-	orientation     = HORIZONTAL
-	state		= INSENSITIVE
-	file            = "../images/qgn_plat_scroll_horizontal_thumb_disabled.png"
-	border		= { 10, 10, 0, 0 }
-	stretch         = TRUE
-      }
-    image
-      {
-        function        = BOX
-	orientation     = HORIZONTAL
-	file            = "../images/qgn_plat_scroll_horizontal_shaft_normal.png"
-	border          = { 0, 0, 0, 0 }
-	stretch         = TRUE
-      }
-    image 
-      {
-        function        = SLIDER
-	orientation     = HORIZONTAL
-	file            = "../images/qgn_plat_scroll_horizontal_thumb_normal.png"
-	border		= { 10, 10, 0, 0 }
-	stretch         = TRUE
-      }
-  }
-}
-
-# superclass of scale and and scrollbar
-class "GtkRange" style "osso-range"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkrange.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkrange)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,81 +0,0 @@
-#################
-# REAL, FINISHED STUFF.
-#################
-
-include "base"
-#This has to be first because of font styles.
-
-include "themespecificgtk"
-
-include "afterthemespecificgtk"
-
-include "defaultarrows"
-
-include "gtkbutton"
-include "gtkbuttonbox"
-include "gtkcheckbutton"
-include "gtkcheckmenuitem"
-include "gtkcombobox"
-include "gtkdialog"
-include "gtkentry"
-include "gtkframe"
-include "gtkmenu"
-include "gtkmenuitem"
-include "gtknotebook"
-include "gtkpaned"
-include "gtkprogressbar"
-include "gtkradiobutton"
-include "gtkrange"
-include "gtkscrollbar"
-include "gtkscrolledwindow"
-include "gtkseparator"
-include "gtksettings"
-include "gtktextview"
-include "gtktoolbar"
-include "gtktoolbutton"
-include "gtktoggletoolbutton"
-include "gtktreeview"
-include "gtkmenutoolbutton"
-include "gtkfilechooserbutton"
-include "gtkexpander"
-include "gtkentrycompletion"
-
-include "hildonapp"
-include "hildonbanners"
-include "hildoncandidatebox"
-include "hildoncaption"
-include "hildoncolorchooser"
-include "hildoncontrolbar"
-include "hildongrid"
-include "hildonkeyboard"
-include "hildonnote"
-include "hildonnumbereditor"
-include "hildonseekbar"
-include "hildontimeeditor"
-include "hildonvolumebar"
-include "hildonweekdaypicker"
-include "hildonbreadcrumbbutton"
-include "hildondateeditor"
-
-include "ossoclock"
-include "ossortc"
-include "ossoglobalsearch"
-include "ossoapplicationinstaller"
-include "ossomediaplayer"
-
-# Maemo af desktop widgets included in gtkrc.maemo_af_desktop
-#include "hildonhome"
-#include "hildonhomeapplet"
-#include "hildonnavigator"
-#include "hildonnavigatorpopuplist"
-#include "hildonstatusbar"
-
-
-#include "../../../sapwoods/hildon-icons/stockrc"
-
-##################
-# THESE HAVE MISSING IMAGES BUT ARE HERE BECAUSE OF STYLE PROPERTIES
-##################
-include "gtkcalendar"
-include "hildontimepicker"
-include "afterincludes"

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc.maemo_af_desktop
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc.maemo_af_desktop	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc.maemo_af_desktop	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,20 +0,0 @@
-#
-# Adding all non-maemo_af_desktop widgets into maemo_af_desktop 
-include "base"
-
-# Adding maemo_af_desktop specific widgets 
-include "hildonhome"
-include "hildonnavigator"
-include "hildonnavigatorpopuplist"
-include "hildonstatusbar"
-
-##################
-# THESE HAVE MISSING IMAGES BUT ARE HERE BECAUSE OF STYLE PROPERTIES
-##################
-
-# Home applets
-include "ossoclock"
-include "ossoiradioapplet"
-include "ossorssfeedreader"
-include "ossospeeddial"
-include "ossointernetsearchapplet"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc.maemo_af_desktop.rc (from rev 8447, projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc.maemo_af_desktop)
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc.maemo_af_desktop	2006-11-29 11:19:23 UTC (rev 8447)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc.maemo_af_desktop.rc	2006-11-30 12:16:20 UTC (rev 8494)
@@ -0,0 +1,20 @@
+#
+# Adding all non-maemo_af_desktop widgets into maemo_af_desktop 
+include "base.rc"
+
+# Adding maemo_af_desktop specific widgets 
+include "hildonhome.rc"
+include "hildonnavigator.rc"
+include "hildonnavigatorpopuplist.rc"
+include "hildonstatusbar.rc"
+
+##################
+# THESE HAVE MISSING IMAGES BUT ARE HERE BECAUSE OF STYLE PROPERTIES
+##################
+
+# Home applets
+include "ossoclock.rc"
+include "ossoiradioapplet.rc"
+include "ossorssfeedreader.rc"
+include "ossospeeddial.rc"
+include "ossointernetsearchapplet.rc"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc.rc (from rev 8447, projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc)
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc	2006-11-29 11:19:23 UTC (rev 8447)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkrc.rc	2006-11-30 12:16:20 UTC (rev 8494)
@@ -0,0 +1,63 @@
+include "base.rc"
+
+include "themespecificgtk.rc"
+include "afterthemespecificgtk.rc"
+
+include "defaultarrows.rc"
+
+include "gtkbutton.rc"
+include "gtkbuttonbox.rc"
+include "gtkcheckbutton.rc"
+include "gtkcheckmenuitem.rc"
+include "gtkcombobox.rc"
+include "gtkdialog.rc"
+include "gtkentry.rc"
+include "gtkframe.rc"
+include "gtkmenu.rc"
+include "gtkmenuitem.rc"
+include "gtknotebook.rc"
+include "gtkpaned.rc"
+include "gtkprogressbar.rc"
+include "gtkradiobutton.rc"
+include "gtkrange.rc"
+include "gtkscrollbar.rc"
+include "gtkscrolledwindow.rc"
+include "gtkseparator.rc"
+include "gtksettings.rc"
+include "gtktextview.rc"
+include "gtktoolbar.rc"
+include "gtktoolbutton.rc"
+include "gtktoggletoolbutton.rc"
+include "gtktreeview.rc"
+include "gtkmenutoolbutton.rc"
+include "gtkfilechooserbutton.rc"
+include "gtkexpander.rc"
+include "gtkentrycompletion.rc"
+include "gtkcalendar.rc"
+
+include "hildonapp.rc"
+include "hildonbanners.rc"
+include "hildoncandidatebox.rc"
+include "hildoncaption.rc"
+include "hildoncolorchooser.rc"
+include "hildoncontrolbar.rc"
+include "hildongrid.rc"
+include "hildonkeyboard.rc"
+include "hildonnote.rc"
+include "hildonnumbereditor.rc"
+include "hildonseekbar.rc"
+include "hildontimeeditor.rc"
+include "hildonvolumebar.rc"
+include "hildonweekdaypicker.rc"
+include "hildonbreadcrumbbutton.rc"
+include "hildondateeditor.rc"
+
+include "ossoclock.rc"
+include "ossortc.rc"
+include "ossoglobalsearch.rc"
+include "ossoapplicationinstaller.rc"
+include "ossomediaplayer.rc"
+
+include "hildontimepicker.rc"
+
+include "afterincludes.rc"

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrollbar
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrollbar	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrollbar	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,173 +0,0 @@
-#################################################### 
-# GTK SCROLLBAR
-#
-#################################################### 
-
-style "osso-scrollbar"
-{
-
-  GtkRange::stepper_size = 26
-  GtkRange::stepper_spacing = 0
-  GtkRange::trough_border = 0
-  GtkRange::slider_width = 22
-  GtkRange::draw_trough_under_steppers = 0
-  GtkRange::draw_trough = 0
-  GtkRange::arrow_displacement_x = 0
-  GtkRange::arrow_displacement_y = 0
-  GtkRange::autodimmed_steppers = 1
-  GtkScrollbar::min-slider-length = 32
-
-  engine "sapwood"
-  {
-
-    # left
-    image 
-      {
-        function        = STEPPER
-	state           = ACTIVE
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_scroll_horizontal_left_arrow_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = STEPPER
-	state           = SELECTED
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_scroll_horizontal_left_arrow_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = STEPPER
-	state           = INSENSITIVE
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_scroll_horizontal_left_arrow_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image    
-      {
-        function        = STEPPER
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_scroll_horizontal_left_arrow_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    
-    # right
-    image
-      {
-        function        = STEPPER
-	state           = ACTIVE
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_scroll_horizontal_right_arrow_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = STEPPER
-	state           = SELECTED
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_scroll_horizontal_right_arrow_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = STEPPER
-	state           = INSENSITIVE
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_scroll_horizontal_right_arrow_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = STEPPER
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_scroll_horizontal_right_arrow_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-
-    # up
-    image
-      {
-        function        = STEPPER
-	state           = ACTIVE
-	arrow_direction = UP
-	overlay_file    = "../images/qgn_plat_scroll_vertical_up_arrow_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = STEPPER
-	state           = SELECTED
-	arrow_direction = UP
-	overlay_file    = "../images/qgn_plat_scroll_vertical_up_arrow_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = STEPPER
-	state           = INSENSITIVE
-	arrow_direction = UP
-	overlay_file    = "../images/qgn_plat_scroll_vertical_up_arrow_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = STEPPER
-	arrow_direction = UP
-	overlay_file    = "../images/qgn_plat_scroll_vertical_up_arrow_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    
-    # down
-    image
-      {
-        function        = STEPPER
-	state           = ACTIVE
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_scroll_vertical_down_arrow_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = STEPPER
-	state           = SELECTED
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_scroll_vertical_down_arrow_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = STEPPER
-	state           = INSENSITIVE
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_scroll_vertical_down_arrow_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = STEPPER
-	arrow_direction = DOWN
-	overlay_file    = "../images/qgn_plat_scroll_vertical_down_arrow_normal.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = FALSE
-      }
-  }
-}
-
-class "GtkScrollbar" style "osso-scrollbar"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrollbar.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrollbar)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrolledwindow
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrolledwindow	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrolledwindow	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,19 +0,0 @@
-#######################################
-# GtkScrolledWindow
-#######################################
-
-style "osso-scrolledwindow"
-{
-
-  GtkScrolledWindow::scrollbar-spacing = 6
-
-}
-class "GtkScrolledWindow" style "osso-scrolledwindow"
-
-style "osso-special-scrolledwindow"
-{
-	GtkScrolledWindow::scrollbar-dislocation = 1
-}
-
-widget_class "*.GtkScrolledWindow" style "osso-special-scrolledwindow"
-widget_class "GtkDialog.GtkVBox.GtkScrolledWindow" style "osso-special-scrolledwindow"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrolledwindow.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkscrolledwindow)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtkseparator
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtkseparator	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtkseparator	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,37 +0,0 @@
-#################################################### 
-# GTK SEPARATOR
-#
-# Copyright 2005 Nokia Oyj
-#
-# This file themes separators.
-#
-####################################################
-
-style "osso-separator"
-{
-  GtkSeparator::hildonlike-drawing = 1
-  ythickness = 3
-  xthickness = 3
-  
-  engine "sapwood"
-    {
-      image
-        {
-	  function    = BOX
-	  detail      = "hseparator"
-	  file        = "../images/qgn_plat_separator_horizontal.png"
-	  border      = { 12, 12, 0, 0 }
-	  stretch     = TRUE
-	}
-      image
-        {
-	  function    = BOX
-	  detail      = "vseparator"
-	  file        = "../images/qgn_plat_separator_vertical.png"
-	  border      = { 0, 0, 12, 12 }
-	  stretch     = TRUE
-	}
-    }
-}
-
-class "GtkSeparator" style "osso-separator"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtkseparator.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtkseparator)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtksettings
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtksettings	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtksettings	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,20 +0,0 @@
-#
-# GTK-SETTINGS
-#
-
-# Default backend to use
-gtk-file-chooser-backend = "gnome-vfs"
-
-# Are we using toolbar animation
-gtk-toolbar-animation = 0
-gtk-toolbar-style = GTK_TOOLBAR_ICONS
-
-# Keyboard navigation
-hildon-keyboard-navigation = 1
-
-# Menu interaction
-gtk-menu-shell-timeout = -1
-
-# Drag and drop treshold
-gtk-dnd-drag-threshold = 30
-

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtksettings.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtksettings)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtktextview
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtktextview	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtktextview	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,44 +0,0 @@
-####################################################  
-# GTK TEXTVIEW (Multiline editor)
-#
-# Copyright 2005 Nokia Oyj
-#
-# This file has the themeing of GtkTextView.
-#
-#################################################### 
-
-style "osso-textview"
-{
-  GtkWidget::focus_line_width = 3
-  
-  engine "sapwood"
-    {
-      image
-        {
-	  function = FOCUS
-	  state    = INSENSITIVE
-	  detail   = "textview"
-	  file     = "../images/qgn_plat_multi_line_input_disabled.png"
-	  border   = { 2, 2, 2, 2 }
-	  stretch  = TRUE
-	}
-      image
-        {
-	  function = FOCUS
-	  detail   = "textview"
-	  file     = "../images/qgn_plat_multi_line_input.png"
-	  border   = { 2, 2, 2, 2 }
-	  stretch  = TRUE
-	}
-      image
-        {
-	  function = FOCUS
-#	  detail   = "textview"
-	  file     = "../images/qgn_plat_multi_line_input.png"
-	  border   = { 2, 2, 2, 2 }
-	  stretch  = TRUE
-	}
-    }
-}
-
-class "GtkTextView" style "osso-textview"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtktextview.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtktextview)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtktoggletoolbutton
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtktoggletoolbutton	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtktoggletoolbutton	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,34 +0,0 @@
-
-#################################################### 
-# GTK TOGGLE BUTTON
-# 
-# Make sure the button appears "pushed" when the toggle
-# button is active, but we are in PRELIGHT state.
-#################################################### 
-
-# default style:
-style "osso-toggletoolbutton" {
-
-   engine "sapwood" {
-
-      image
-      {
-          function          = BOX
-              state             = ACTIVE
-          file              = "../images/qgn_plat_toolbar_button_selected.png"
-          border            = { 23, 23, 0, 0 }	
-          stretch           = TRUE
-      }
-      image
-      {
-          function          = BOX
-          state             = PRELIGHT
-          shadow            = IN
-          file              = "../images/qgn_plat_toolbar_button_selected.png"
-          border            = { 23, 23, 0, 0 }	
-          stretch           = TRUE
-      }
-   }
-}
-
-widget_class "*.GtkToolbar.GtkToggleToolButton.GtkToggleButton" style "osso-toggletoolbutton"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtktoggletoolbutton.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtktoggletoolbutton)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbar
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbar	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbar	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,48 +0,0 @@
-#################################################### 
-# GTK TOOLBAR
-#
-#################################################### 
-
-style "osso-toolbar"
-{
-  GtkToolbar::button-relief = GTK_RELIEF_NORMAL
-  GtkToolbar::shadow-type = GTK_SHADOW_NONE
-  GtkToolbar::max-child-expand = 800
-  engine "sapwood"
-  {
-    image
-    {
-      function = BOX
-    }
-  }
-}
-class "GtkToolbar" style "osso-toolbar"
-
-style "osso-toolbar-separator"
-{
-	GtkSeparatorToolItem::separator_size = 15
-	GtkSeparatorToolItem::is_image = 1
-	engine "sapwood"
-	{	
-
-		image{
-			function = BOX
-			shadow = NONE
-			state = NORMAL
-			detail = "vertical"
-			file = "../images/qgn_plat_toolbar_separator.png"
-			stretch = TRUE
-			border = {0,0,0,0}
-		}
-		image{
-			function = BOX
-			shadow = NONE
-			state = NORMAL
-			detail = "horizontal"
-			file = "../images/qgn_plat_toolbar_separator.png"
-			stretch = TRUE
-			border = {0,0,0,0}
-		}
-	}
-}
-class "GtkSeparatorToolItem" style "osso-toolbar-separator"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbar.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbar)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbutton
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbutton	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbutton	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,78 +0,0 @@
-
-#################################################### 
-# GTK TOOL BUTTON
-# 
-# Make sure the button appears "pushed" when the
-# button is active, but we are in PRELIGHT state.
-#################################################### 
-
-# default style:
-style "osso-toolbutton" {
-
-   GtkButton::child_displacement_x = -2
-   GtkButton::child_displacement_y = 2
-   GtkButton::minimum_width = 48
-#   GtkButton::minimum_height = 40
-
-   engine "sapwood" {
-
-      image
-      {
-          function          = FOCUS
-      }
-      image
-      {
-          function          = BOX
-	      state             = ACTIVE
-          file              = "../images/qgn_plat_toolbar_button_pressed.png"
-	      border            = { 23, 23, 0, 0 }	
-          stretch           = TRUE
-      }
-      image
-      {
-          function          = BOX
-     	  state             = PRELIGHT
-	      shadow            = OUT
-          file              = "../images/qgn_plat_toolbar_button_normal.png"
-          border            = { 23, 23, 0, 0 }	
-          stretch           = TRUE
-      }
-      image
-      {
-          function          = BOX
-    	  state             = PRELIGHT
-    	  shadow            = IN
-          file              = "../images/qgn_plat_toolbar_button_pressed.png"
-    	  border            = { 23, 23, 0, 0 }	
-          stretch           = TRUE
-      }
-      image
-      {
-          function          = BOX
-    	  state             = INSENSITIVE
-          file              = "../images/qgn_plat_toolbar_button_disabled.png"
-    	  border            = { 23, 23, 0, 0 }	
-          stretch           = TRUE
-      }
-      image
-      {
-          function          = BOX
-          file              = "../images/qgn_plat_toolbar_button_normal.png"		             
-	      border            = { 23, 23, 0, 0 }	
-          stretch           = TRUE
-      }
-   }
-}
-
-widget_class "*.GtkToolButton.GtkButton" style "osso-toolbutton"
-widget_class "*.GtkToggleToolButton.GtkToggleButton" style "osso-toolbutton"
-widget_class "*.GtkMenuToolButton.GtkHBox.GtkButton" style "osso-toolbutton"
-widget_class "*.GtkMenuToolButton.GtkHBox.GtkToggleButton" style "osso-toolbutton"
-widget_class "*.GtkRadioToolButton.GtkRadioButton" style "osso-toolbutton"
-
-
-# The below two lines are mainly for Sketch application.
-# Especially the togglebutton thins is pretty interesting
-
-widget_class "*.GtkToolItem.HildonColorButton" style "osso-toolbutton"
-widget_class "*.GtkToolbar.GtkToggleButton" style "osso-toolbutton"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbutton.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtktoolbutton)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/gtktreeview
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/gtktreeview	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/gtktreeview	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,356 +0,0 @@
-# Theming for both GtkTreeView and GtkListView.
-
-style "osso-listview" = "osso-logical-colors"
-{
-
-  text[ACTIVE] = "DefaultTextColor"
-  text[SELECTED] = "DefaultTextColor"
-
-  GtkTreeView::odd_row_color = "DefaultBackgrdColor"
-  GtkTreeView::even_row_color = "DefaultBackgrdColor"
-  GtkTreeView::expander-size = 0
-  GtkTreeView::expander-indent = 8
-  GtkTreeView::horizontal-separator = 6
-  GtkTreeView::vertical-separator = 2	  
-  GtkTreeView::hildonlike = 1
-  GtkTreeView::passive_focus = 1
-  GtkTreeView::separator-height = 15
-
-  engine "sapwood"
-  {
-    image
-      {
-        function        = CHECK
-        state           = INSENSITIVE
-        shadow          = IN
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_selected_disabled.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = CHECK
-        state           = SELECTED
-        shadow          = IN
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_selected_focused.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }  
-    image
-      {
-        function        = CHECK
-        state           = ACTIVE
-        shadow          = IN
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_selected_focused.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }  
-    image
-      {
-        function        = CHECK
-        state           = PRELIGHT
-        shadow          = IN
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_selected_normal.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }  
-    image
-      {
-        function        = CHECK
-        state           = NORMAL
-        shadow          = IN
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_selected_normal.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }  
-    image
-      {
-        function        = CHECK
-        state           = INSENSITIVE
-        shadow          = OUT
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_empty_disabled.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = CHECK
-        state           = SELECTED
-        shadow          = OUT
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_empty_focused.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }  
-    image
-      {
-        function        = CHECK
-        state           = ACTIVE
-        shadow          = OUT
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_empty_focused.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }  
-    image
-      {
-        function        = CHECK
-        state           = PRELIGHT
-        shadow          = OUT
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_empty_normal.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }  
-    image
-      {
-        function        = CHECK
-        state           = NORMAL
-        shadow          = OUT
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_empty_normal.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }  
-    image
-      {
-        function        = CHECK
-        state           = NORMAL
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_empty_normal.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = CHECK
-        state           = PRELIGHT
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_empty_normal.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = CHECK
-        state           = ACTIVE
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_selected_normal.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = CHECK
-        state           = SELECTED
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_selected_normal.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = CHECK
-        state           = INSENSITIVE
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_empty_normal.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }
-    image
-    {
-      function = FLAT_BOX
-      state    = SELECTED
-      detail = "left"
-      file = "../images/qgn_plat_focus_left_selection.png"
-      border = { 2, 0, 2, 2 }
-      stretch = TRUE
-    }
-    image
-    {
-      function = FLAT_BOX
-      state    = SELECTED
-      detail = "middle"
-      file = "../images/qgn_plat_focus_middle_selection.png"
-      border = { 0, 0, 2, 2 }
-      stretch = TRUE
-    }
-    image
-    {
-      function = FLAT_BOX
-      state    = SELECTED
-      detail = "right"
-      file = "../images/qgn_plat_focus_right_selection.png"
-      border = { 0, 2, 2, 2 }
-      stretch = TRUE
-    }
-    image
-    {
-      function = FLAT_BOX
-      state    = SELECTED
-      detail = "full"
-      file = "../images/qgn_plat_focus_selection.png"
-      border = { 2, 2, 2, 2 }
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      detail = "left"
-      file = "../images/qgn_plat_focus_left_active.png"
-      border = { 2, 0, 2, 2 }
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      detail = "middle"
-      file = "../images/qgn_plat_focus_middle_active.png"
-      border = { 0, 0, 2, 2 }
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      detail = "right"
-      file = "../images/qgn_plat_focus_right_active.png"
-      border = { 0, 2, 2, 2 }
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      detail = "full"
-      file = "../images/qgn_plat_focus_active.png"
-      border = { 2, 2, 2, 2 }
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      detail = "treeview-drop-indicator-left"
-      file = "../images/qgn_plat_focus_left_active.png"
-      border = { 2, 0, 2, 2 }
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      detail = "treeview-drop-indicator-middle"
-      file = "../images/qgn_plat_focus_middle_active.png"
-      border = { 0, 0, 2, 2 }
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      detail = "treeview-drop-indicator-right"
-      file = "../images/qgn_plat_focus_right_active.png"
-      border = { 0, 2, 2, 2 }
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      detail = "treeview-drop-indicator"
-      file = "../images/qgn_plat_focus_active.png"
-      border = { 2, 2, 2, 2 }
-      stretch = TRUE
-    }
-  }
-}
-
-class "GtkTreeView" style "osso-listview"
-class "GtkListView" style "osso-listview"
-
-
-style "osso-listboxheader"
-{
-  GtkButton::separator-height = 15
-  engine "sapwood"
-    {
-      image
-        {
-	  function = BOX
-	  file = "../images/qgn_plat_column_listbox_header.png"
-	  border = { 2, 2, 2, 17 }
-	}
-      image
-        {
-	  function = FOCUS
-	  file = "../images/qgn_plat_column_listbox_header.png"
-	  border = { 2, 2, 2, 17 }
-	}
-    }
-}
-widget_class "*.GtkTreeView.GtkButton" style "osso-listboxheader"
-
-
-style "osso-treeviewcolumn-sortarrow" {
-	engine "sapwood" {
-		image {
-			function = ARROW
-			arrow_direction = DOWN
-			overlay_file = "../images/qgn_plat_arrow_listbox_header_down.png"
-		        overlay_stretch = FALSE
-		}
-		image {
-			function = ARROW
-			arrow_direction = UP
-			overlay_file = "../images/qgn_plat_arrow_listbox_header_up.png"
-		        overlay_stretch = FALSE
-		}
-	}
-}
-widget_class "*.GtkTreeView.GtkButton.GtkHBox.GtkArrow" style "osso-treeviewcolumn-sortarrow"
-
-
-################################
-# Passive focus to GtkTreeView
-################################
-
-style "osso-focus"
-{
-	engine "sapwood"
-	{
-		image
-		{
-			function = FOCUS
-                        detail = "left"
-			file = "../images/qgn_plat_focus_left_passive.png"
-			border = { 2, 0, 2, 2 }
-			stretch = TRUE
-		}		
-		image
-		{
-			function = FOCUS
-                        detail = "middle"
-			file = "../images/qgn_plat_focus_middle_passive.png"
-			border = { 0, 0, 2, 2 }
-			stretch = TRUE
-		}		
-		image
-		{
-			function = FOCUS
-                        detail = "right"
-			file = "../images/qgn_plat_focus_right_passive.png"
-			border = { 0, 2, 2, 2 }
-			stretch = TRUE
-		}		
-		image
-		{
-			function = FOCUS
-                        detail = "full"
-			file = "../images/qgn_plat_focus_passive.png"
-			border = { 2, 2, 2, 2 }
-			stretch = TRUE
-		}		
-	}
-}
-widget "hildon-focus" style "osso-focus"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/gtktreeview.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/gtktreeview)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildonapp
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildonapp	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildonapp	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,117 +0,0 @@
-#################################################### 
-# OSSO app pictures
-#################################################### 
-
-style "osso-window-background" {
-   HildonAppview::border-width = 0
-   HildonWindow::borders = { 24, 24, 0, 24 }
-   HildonWindow::toolbar-borders = { 24, 24, 9, 9 }
-   engine "sapwood" {
-	image {
-	 	function = BOX
-		state = NORMAL
-		detail = "left-border"
-		file = "../images/qgn_plat_application_frame_left.png"
-		stretch = TRUE
-	}
-	image {
-		function = BOX
-		state = NORMAL
-		detail = "right-border"
-		file = "../images/qgn_plat_application_frame_right.png"
-		stretch = TRUE
-	}
-	image {
-	 	function = BOX
-		state = NORMAL
-		detail = "bottom-border"
-		file = "../images/qgn_plat_application_frame_bottom.png"
-		border = { 24, 24, 0, 0 }
-		stretch = TRUE
-        }
-	image {
-		function = BOX
-		state = NORMAL
-		detail = "toolbar-frame-top"
-		file = "../images/qgn_plat_toolbar_frame_top.png"
-		border = { 24, 24, 0, 0 }
-		stretch = TRUE
-	}
-	image {
-		function = BOX
-		state = NORMAL
-		detail = "toolbar-frame-middle"
-		file = "../images/qgn_plat_toolbar_frame_middle.png"
-		border = { 24, 24, 0, 0 }
-		stretch = TRUE
-	}
-	image {
-		function = BOX
-		state = NORMAL
-		detail = "toolbar-frame-bottom"
-		file = "../images/qgn_plat_toolbar_frame_bottom.png"
-		border = { 24, 24, 0, 0 }
-		stretch = TRUE
-	}
-	image {
-		function = BOX
-		state = NORMAL
-		detail = "findtoolbar"
-		file = "../images/qgn_plat_toolbar_find.png"
-		border = { 24, 24, 0, 0 }
-		stretch = TRUE
-	}
-	image {
-		function = BOX
-		state = NORMAL
-		detail = "toolbar"
-		file = "../images/qgn_plat_toolbar.png"
-		border = { 24, 24, 0, 0 }
-		stretch = TRUE
-	}
-
-	image {
-		function = BOX
-		state = NORMAL
-		detail = "toolbar-fullscreen-frame-top"
-		file = "../images/qgn_plat_toolbar_fullscreen_frame_top.png"
-		border = { 24, 24, 0, 0 }
-		stretch = TRUE
-	}
-	image {
-		function = BOX
-		state = NORMAL
-		detail = "toolbar-fullscreen-frame-middle"
-		file = "../images/qgn_plat_toolbar_fullscreen_frame_middle.png"
-		border = { 24, 24, 0, 0 }
-		stretch = TRUE
-	}
-	image {
-		function = BOX
-		state = NORMAL
-		detail = "toolbar-fullscreen-frame-bottom"
-		file = "../images/qgn_plat_toolbar_fullscreen_frame_bottom.png"
-		border = { 24, 24, 0, 0 }
-		stretch = TRUE
-	}
-	image {
-		function = BOX
-		state = NORMAL
-		detail = "findtoolbar-fullscreen"
-		file = "../images/qgn_plat_toolbar_fullscreen_find.png"
-		border = { 24, 24, 0, 0 }
-		stretch = TRUE
-	}
-	image {
-		function = BOX
-		state = NORMAL
-		detail = "toolbar-fullscreen"
-		file = "../images/qgn_plat_toolbar_fullscreen.png"
-		border = { 24, 24, 0, 0 }
-		stretch = TRUE
-	}
-   }
-}
-
-class "HildonAppView" style "osso-window-background"
-class "HildonWindow" style "osso-window-background"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildonapp.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildonapp)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildonbanners
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildonbanners	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildonbanners	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,11 +0,0 @@
-######################################
-#
-# BANNERS
-#
-# Copyright 2004,2005 Nokia Oyj
-#
-# The banner & infoprint fonts are defined here
-#
-######################################
-
-widget "*.hildon-banner-label" style "osso-EmpSystemFont"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildonbanners.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildonbanners)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildonbreadcrumbbutton
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildonbreadcrumbbutton	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildonbreadcrumbbutton	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,92 +0,0 @@
-####################################################
-# HILDON BREAD CRUMB BUTTON
-#
-# Copyright 2006 Nokia Oyj
-#
-# This file has the themeing of toolbar's menu
-# button.
-#
-# The choicelist version of combobox which only
-# allows selection, not edition is named GtkComboBox
-# and is actually just one big GtkButton that has text
-# inside it. Therefore one image per state is enough
-# for it.
-#
-# The combobox version that allows editing of the text
-# is named GtkComboBoxEntry and consists of two parts:
-# A GtkButton and GtkEntry. These have to be themed
-# separately.
-#
-# Additionally, when a combobox is in a toolbar,
-# it will use different graphics that show the arrow
-# pointing upwards.
-#
-####################################################
-
-
-####################################################
-#
-# Style for the hildon-bread-crumb-button
-#
-####################################################
-
-
-style "osso-breadcrumb-button" = "osso-logical-colors" {
-
-    GtkWidget::focus-line-pattern = "\0\0\0\0\0\0\0\0"
-    GtkWidget::focus-width = 0
-    GtkButton::default_border = { 0, 0, 0, 0 }
-    GtkButton::child-displacement-x = 0
-    GtkButton::child-displacement-y = 1
-    GtkButton::interior_focus = 0
-    GtkButton::child_spacing = 1
-    xthickness = 0
-    ythickness = 0
-
-    fg[INSENSITIVE] = "DefaultTextColor"
-
-    engine "sapwood" {
-
-        image {
-            function = FOCUS
-            state    = ACTIVE
-            file     = "../images/qgn_plat_button_breadcrumb_pressed.png"
-            border   = { 14, 14, 14, 14 }
-            stretch  = TRUE
-        }
-        image {
-            function = FOCUS
-            file     = "../images/qgn_plat_button_breadcrumb_focused.png"
-            border   = { 14, 14, 14, 14 }
-            stretch  = TRUE
-        }
-        image {
-            function = BOX
-            shadow   = IN
-            file     = "../images/qgn_plat_button_breadcrumb_pressed.png"
-            border   = { 14, 14, 14, 14 }
-            stretch  = TRUE
-        }
-        image {
-            function = BOX
-            state    = SELECTED
-            file     = "../images/qgn_plat_button_breadcrumb_pressed.png"
-            border   = { 14, 14, 14, 14 }
-            stretch  = TRUE
-        }
-        image {
-            function = BOX
-            state    = INSENSITIVE
-            # no image
-        }
-        image {
-            function = BOX
-            file     = "../images/qgn_plat_button_breadcrumb_normal.png"
-            border   = { 14, 14, 14, 14 }
-            stretch  = TRUE
-        }
-
-    }
-}
-
-widget "*.osso-breadcrumb-button*"   style "osso-breadcrumb-button"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildonbreadcrumbbutton.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildonbreadcrumbbutton)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildoncandidatebox
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildoncandidatebox	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildoncandidatebox	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,48 +0,0 @@
-##############################
-# HildonCandidateBox
-##############################
-style "osso-candidate-box"
-{
-	fg[NORMAL] = "#aaaaaa"
-	fg[ACTIVE] = "#aaaaaa"
-	fg[INSENSITIVE] = "#aaaaaa"
-	fg[PRELIGHT] = "#aaaaaa"
-	bg[INSENSITIVE] = "#cccccc"
-	bg[NORMAL] = "#cccccc"
-	bg[ACTIVE] = "#cccccc"
-	bg[PRELIGHT] = "#cccccc"
-	xthickness = 0
-	ythickness = 0
-}
-widget_class "*HildonCandidateBox" style "osso-candidate-box"
-
-style "osso-candidate-box-menu"
-{
-    GtkMenu::hildonlike = 1
-	GtkMenu::double_arrows = 1
-	GtkWidget::focus-padding = 0
-	GtkWidget::focus-line-width = 0
-	GtkMenu::vertical-padding = 0
-	GtkMenu::horizontal-padding = 0
-	GtkContainer::border-width = 0
-	xthickness = 0
-	ythickness = 0
-}
-widget "*hildon-candidate-box-menu" style "osso-candidate-box-menu"
-
-style "osso-candidate-box-menu-item"
-{ 
-	GtkMenuItem::include_arrow_in_focus = 0
-	GtkMenuItem::hildonlike = 1
-	GtkMenuItem::separator_height = 5
-	GtkMenuItem::horizontal-padding = 0
-	GtkWidget::has-focus = TRUE
-	GtkWidget::focus-padding = 0
-	GtkWidget::focus-line-width = 0
-	GtkMenuItem::arrow-spacing = 0
-	GtkContainer::border-width = 0
-	xthickness = 0
-	ythickness = 0
-}													  
-widget "*hildon-candidate-box-menu-item" style "osso-candidate-box-menu-item"
-

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildoncandidatebox.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildoncandidatebox)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildoncaption
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildoncaption	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildoncaption	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,5 +0,0 @@
-style "osso-caption-control"
-{
-  ythickness = 1
-}
-class "HildonCaption" style "osso-caption-control"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildoncaption.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildoncaption)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildoncolorchooser
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildoncolorchooser	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildoncolorchooser	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,42 +0,0 @@
-style "colorchoosar"
-{
-  HildonColorChooser::outer-border = { 3, 3, 3, 3 }
-
-  HildonColorChooserHSV::inner-size = { 202, 202, 26, 18 }
-  HildonColorChooserHSV::graphic-border = { 3, 3, 3, 3 }
-
-
-}
-class "HildonColorChooser" style "colorchoosar"
-
-
-style "chooserdialog"
-{
-  HildonColorChooserDialogHSV::radio-sizes = { 26, 26, 0, 3 }
-  HildonColorChooserDialogHSV::container-sizes = { 18, 12, 6, 0 }
-
-  HildonColorChooserDialogHSV::num-buttons = { 8, 2, 8, 4 }
-
-  HildonColorChooserDialogHSV::defined-color0  = "#000000"
-  HildonColorChooserDialogHSV::defined-color1  = "#660000"
-  HildonColorChooserDialogHSV::defined-color2  = "#0000FF"
-  HildonColorChooserDialogHSV::defined-color3  = "#FF00FF"
-  HildonColorChooserDialogHSV::defined-color4  = "#006600"
-  HildonColorChooserDialogHSV::defined-color5  = "#666600"
-  HildonColorChooserDialogHSV::defined-color6  = "#666666"
-  HildonColorChooserDialogHSV::defined-color7  = "#FF0000"
-  HildonColorChooserDialogHSV::defined-color8  = "#00FFFF"
-  HildonColorChooserDialogHSV::defined-color9  = "#FFFFFF"
-  HildonColorChooserDialogHSV::defined-color10 = "#00FF00"
-  HildonColorChooserDialogHSV::defined-color11 = "#FFFF00"
-
-  HildonColorChooserDialogHSV::defined-color12 = "#000066"
-  HildonColorChooserDialogHSV::defined-color13 = "#660066"
-  HildonColorChooserDialogHSV::defined-color14 = "#006666"
-  HildonColorChooserDialogHSV::defined-color15 = "#CCCCCC"
-
-  HildonColorChooserDialogHSV::default-color = "#ffffff"
-
-
-}
-class "HildonColorChooserDialog" style "chooserdialog"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildoncolorchooser.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildoncolorchooser)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildoncontrolbar
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildoncontrolbar	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildoncontrolbar	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,162 +0,0 @@
-#################################################### 
-# HILDON CONTROLBAR
-# 
-# Theming instructions for HildonControlbar -widget
-#
-# NOTE: pictures might not be right...
-#
-#################################################### 
-
-style "osso-controlbar"
-{
-	HildonControlbar::stepper_size = 26
-	HildonControlbar::slider_width = 30
-	HildonControlbar::stepper_spacing = 6
-	HildonControlbar::trough_border = 0
-	HildonControlbar::slider_length = 0
-        HildonControlbar::autodimmed_steppers = 1
-        HildonControlbar::inner_border_width = 4
-	GtkWidget::focus-line-width = 0
-	GtkWidget::focus-padding = 0
-	GtkRange::hildonlike = 1
-	GtkRange::draw_trough_under_steppers = 0
-
-	engine "sapwood" {
-		#
-		# At first, lets override some gtkrange specific things
-		#
-      		image {
-	 		function = BOX
-			detail = "stepper"
-      		}
-      		image {
-	 		function = SLIDER
-      		}
-		
-		#
-		# Then, lets define our osso specific things
-		#
-		
-		# Less button
-		image {
-	        	function = ARROW
-			arrow_direction = LEFT
-			state = NORMAL
-			overlay_file = "../images/qgn_plat_control_bar_less_normal.png"
-			overlay_border = { 0, 0, 0, 0 }
-			overlay_stretch = FALSE
-      		}
-		image {
-	        	function = ARROW
-			arrow_direction = LEFT
-			state = PRELIGHT
-			overlay_file = "../images/qgn_plat_control_bar_less_normal.png"
-			overlay_border = { 0, 0, 0, 0 }
-			overlay_stretch = FALSE
-      		}
-		image {
-	        	function = ARROW
-			arrow_direction = LEFT
-			state = ACTIVE
-			overlay_file = "../images/qgn_plat_control_bar_less_pressed.png"
-			overlay_border = { 0, 0, 0, 0 }
-			overlay_stretch = FALSE
-      		}
-		image {
-	        	function = ARROW
-			arrow_direction = LEFT
-			state = INSENSITIVE
-			overlay_file = "../images/qgn_plat_control_bar_less_disabled.png"
-			overlay_border = { 0, 0, 0, 0 }
-			overlay_stretch = FALSE
-      		}
-		
-		# More button
-		image {
-	        	function = ARROW
-			arrow_direction = RIGHT
-			state = NORMAL
-			overlay_file = "../images/qgn_plat_control_bar_more_normal.png"
-			overlay_border = { 0, 0, 0, 0 }
-			overlay_stretch = FALSE
-      		}
-		image {
-	        	function = ARROW
-			arrow_direction = RIGHT
-			state = PRELIGHT
-			overlay_file = "../images/qgn_plat_control_bar_more_normal.png"
-			overlay_border = { 0, 0, 0, 0 }
-			overlay_stretch = FALSE
-      		}
-		image {
-	        	function = ARROW
-			arrow_direction = RIGHT
-			state = ACTIVE
-			overlay_file = "../images/qgn_plat_control_bar_more_pressed.png"
-			overlay_border = { 0, 0, 0, 0 }
-			overlay_stretch = FALSE
-      		}
-		image {
-	        	function = ARROW
-			arrow_direction = RIGHT
-			state = INSENSITIVE
-			overlay_file = "../images/qgn_plat_control_bar_more_disabled.png"
-			overlay_border = { 0, 0, 0, 0 }
-			overlay_stretch = FALSE
-      		}
-		
-		# Controlbar frame borders
-      		image {
-	 		function = BOX
-			detail = "trough"
-			state = INSENSITIVE
-	 		file = "../images/qgn_plat_control_bar_border_disabled.png"
-	 		border = { 2, 2, 0, 0 }
-	 		stretch = TRUE
-      		}
-      		image {
-	 		function = BOX
-			detail = "trough"
-	 		file = "../images/qgn_plat_control_bar_border.png"
-	 		border = { 2, 2, 0, 0 }
-	 		stretch = TRUE
-      		}
-		
-		# Controlbar blocks
-       		image {
- 	 		function = BOX
- 			shadow = IN
- 			detail = "hildon_block"
- 	 		file = "../images/qgn_plat_control_bar_block_active.png"
- 	 		border = { 2, 2, 0, 0 }
- 	 		stretch = TRUE
-       		}
-       		image {
- 	 		function = BOX
- 			shadow = IN
- 			detail = "hildon_block"
- 			state = INSENSITIVE
- 	 		file = "../images/qgn_plat_control_bar_block_active_disabled.png"
- 	 		border = { 2, 2, 0, 0 }
- 	 		stretch = TRUE
-      		}
-      		image {
-	 		function = BOX
-			shadow = OUT
-			detail = "hildon_block"
-	 		file = "../images/qgn_plat_control_bar_block_passive.png"
-	 		border = { 2, 2, 0, 0 }
-	 		stretch = TRUE
-      		}
-      		image {
-	 		function = BOX
-			shadow = OUT
-			detail = "hildon_block"
-			state = INSENSITIVE
-	 		file = "../images/qgn_plat_control_bar_block_passive_disabled.png"
-	 		border = { 2, 2, 0, 0 }
-	 		stretch = TRUE
-      		}
-	}
-}
-class "HildonControlbar" style "osso-controlbar"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildoncontrolbar.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildoncontrolbar)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildondateeditor
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildondateeditor	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildondateeditor	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,67 +0,0 @@
-#################################################### 
-# HILDON DATE EDITOR
-#
-# Copyright 2006 Nokia Oyj
-#
-# This disables default button graphics from
-# the date editor button.
-#
-####################################################
-
-style "osso-date-editor-button"
-{
-  GtkButton::default_border = { 0, 0, 0, 0 }
-  GtkButton::default_outside_border = { 0, 0, 0, 0 }
-  GtkButton::child-displacement-y = 0
-  GtkButton::child-displacement-x = 0
-  GtkWidget::focus-width = 0
-  GtkButton::interior_focus = 0
-  GtkWidget::focus-padding = 0
-  GtkWidget::focus-line-width = 0
-  GtkButton::child_spacing = 0
-  xthickness = 0
-  ythickness = 0
-
-  engine "sapwood"
-    {
-      image
-        {
-	  function = BOX
-	}
-    }
-}
-
-widget_class "*.HildonDateEditor.GtkButton" style "osso-date-editor-button"
-
-style "osso-date-editor-frame"
-{
-  GtkFrame::hildonlike = 1
-
-  ythickness = 1
-  xthickness = 1
-
-  engine "sapwood"
-    {
-      image
-        {
-          function = BOX
-          state = INSENSITIVE
-          file = "../images/qgn_plat_single_line_input_disabled.png"
-          border = { 2, 2, 2, 2 }
-          stretch = TRUE
-        }
-    }
-
-  engine "sapwood"
-    {
-      image
-        {
-          function = BOX
-          file = "../images/qgn_plat_single_line_input.png"
-          border = { 2, 2, 2, 2 }
-          stretch = TRUE
-        }
-    }
-}
-
-widget_class "*.HildonDateEditor.GtkFrame" style "osso-date-editor-frame"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildondateeditor.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildondateeditor)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildongrid
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildongrid	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildongrid	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,76 +0,0 @@
-# Likely to change
-#
-style "osso-grid-small-icons"
-{
-    HildonGrid::item_height = 30
-    HildonGrid::item_hspacing = 12
-    HildonGrid::item_vspacing = 0
-    
-    HildonGrid::label_hspacing = 6
-    HildonGrid::label_vspacing = 6
-    HildonGrid::label_height = 30
-
-    HildonGrid::icon_size = 26
-    HildonGrid::n_columns = 2
-    HildonGrid::label_pos = 2
-
-    CPGrid::item_height = 30
-    CPGrid::item_hspacing = 12
-    CPGrid::item_vspacing = 0
-    
-    CPGrid::label_hspacing = 6
-    CPGrid::label_vspacing = 6
-    CPGrid::label_height = 30
-
-    CPGrid::icon_size = 26
-    CPGrid::n_columns = 2
-    CPGrid::label_pos = 2
-}
-
-style "osso-grid-big-icons"
-{
-    HildonGrid::item_height = 64
-    HildonGrid::item_hspacing = 12
-    HildonGrid::item_vspacing = 6
-    
-    HildonGrid::label_hspacing = 6
-    HildonGrid::label_vspacing = 6
-    HildonGrid::label_height = 30
-
-    HildonGrid::icon_size = 64
-    HildonGrid::n_columns = 2
-    HildonGrid::label_pos = 1
-    
-    CPGrid::item_height = 64
-    CPGrid::item_hspacing = 12
-    CPGrid::item_vspacing = 6
-    
-    CPGrid::label_hspacing = 6
-    CPGrid::label_vspacing = 6
-    CPGrid::label_height = 30
-
-    CPGrid::icon_size = 64
-    CPGrid::n_columns = 2
-    CPGrid::label_pos = 1
-}
-
-class "HildonGrid" style "osso-grid-big-icons"
-class "CPGrid" style "osso-grid-big-icons"
-
-widget "*.smallicons" style "osso-grid-small-icons"
-
-style "osso-grid-item-label" {
-    engine "sapwood" {
-        image {
-            function = BOX
-            state = SELECTED
-            file = "../images/qgn_plat_focus_active.png"
-            border = {2, 2, 2, 2}
-            stretch = TRUE
-        }
-    }
-}
-widget "*.hildon-grid-item-label" style "osso-grid-item-label"
-
-widget "*.smallicons-cp" style "osso-grid-small-icons"
-widget "*.largeicons-cp" style "osso-grid-big-icons"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildongrid.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildongrid)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildonhome
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildonhome	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildonhome	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,50 +0,0 @@
-#################################################### 
-# HILDON home
-#################################################### 
-
-
-style "osso-home-leftedge" {
-	bg_pixmap[NORMAL] = "../images/qgn_plat_home_border_left.png"
-}
-widget "HildonHomeLeftEdge" style "osso-home-leftedge"
-
-style "osso-home-titlebar-background" {
-	bg_pixmap[NORMAL] = "../images/qgn_plat_home_status_bar_background.png"
-}
-widget "HildonHomeTitleBar" style "osso-home-titlebar-background"
-
-#
-# Home Layout mode applet themeing
-#
-
-style "osso-home-layoutmode-applet" = "osso-logical-colors"
-{
-
-# Used for the border width for all borders
-  GtkWidget::focus-line-width = 4
-
-# Normal state border
-  fg[NORMAL]   = "HomeFrameNormal"
-# Conflicting state border
-  fg[PRELIGHT] = "HomeFrameReject"
-# Resize border
-  fg[ACTIVE]   = "HomeFrameResize"
-
-  engine "sapwood"
-    {
-      image
-        {
-          function = BOX
-          detail   = "close_button"
-          file     = "../images/qgn_home_layoutmode_close.png"
-        }
-      image
-        {
-          function = BOX
-          detail   = "resize_handle"
-          file     = "../images/qgn_home_layoutmode_resize.png"
-        }
-    }
-}
-
-widget "*.osso-home-layoutmode-applet" style "osso-home-layoutmode-applet"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildonhome.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildonhome)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildonkeyboard
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildonkeyboard	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildonkeyboard	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,700 +0,0 @@
-
-##############################
-# Keyboard
-##############################
-
-#input method window top and left frame
-style "osso-input-method-frame"
-{
-  engine "sapwood" {
-    image {
-      function = BOX
-	state = NORMAL
-	detail = "osso-im-frame-top"
-	file = "../images/qgn_plat_inputmet_buffer_zone_top.png"
-	stretch = TRUE
-    }
-    image {
-      function = BOX
-	state = NORMAL
-	detail = "osso-im-frame-left"
-	file = "../images/qgn_plat_inputmet_buffer_zone_left.png"
-	border = {0, 0, 25, 0}
-	stretch = TRUE
-    }
-  }
-}
-class "HildonIMKeyboard" style "osso-input-method-frame"
-
-#close buttons
-style "osso-input-method-side-close-button"
-{
-    engine "sapwood"
-    {
-        image
-        {
-            function = BOX
-	    state = NORMAL
-            file = "../images/qgn_plat_inputmet_button_side_close_normal.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-        }
-	image
-        {
-            function = BOX
-	    state = PRELIGHT
-            file = "../images/qgn_plat_inputmet_button_side_close_normal.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-        }
-
-	image
-        {
-            function = BOX
-	    state = ACTIVE 
-            file = "../images/qgn_plat_inputmet_button_side_close_pressed.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-        }
-    }
-}
-widget "*.OssoIMSideCloseButton" style "osso-input-method-side-close-button"
-
-
-
-#common control buttons
-style "osso-input-method-side-button" = "osso-logical-colors"
-{
-    fg[NORMAL] = "VKBButtonTextColor"
-    fg[ACTIVE] = "VKBButtonTextColor"
-    fg[PRELIGHT] = "VKBButtonTextColor"
-
-    engine "sapwood"
-    {
-        image
-        {
-            function = BOX
-	    state = NORMAL
-            file = "../images/qgn_plat_inputmet_button_side_normal.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-        }
-	image
-        {
-            function = BOX
-	    state = PRELIGHT
-	    shadow = IN
-            file = "../images/qgn_plat_inputmet_button_side_pressed.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-        }
-	image
-        {
-            function = BOX
-	    state = PRELIGHT
-	    shadow = OUT
-            file = "../images/qgn_plat_inputmet_button_side_normal.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = ACTIVE
-            file = "../images/qgn_plat_inputmet_button_side_pressed.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = SELECTED
-            file = "../images/qgn_plat_inputmet_button_side_pressed.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-	    state = INSENSITIVE
-            file = "../images/qgn_plat_inputmet_button_side_disabled.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-        }
-    }
-}
-widget "*.OssoIMSideButton" style "osso-input-method-side-button"
-widget "*.OssoIMSideButton.GtkLabel" style "osso-input-method-side-button"
-
-#common control toggle buttons
-style "osso-input-method-side-toggle-button" = "osso-logical-colors"
-{
-    fg[NORMAL] = "VKBButtonTextColor"
-    fg[ACTIVE] = "VKBButtonTextColor"
-    fg[PRELIGHT] = "VKBButtonTextColor"
-
-    engine "sapwood"
-    {
-        image
-        {
-            function = BOX
-	    shadow = IN
-            file = "../images/qgn_plat_inputmet_button_side_latched.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = SELECTED
-            file = "../images/qgn_plat_inputmet_button_side_latched.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-	}
-        image
-        {
-            function = BOX
-	    state = INSENSITIVE
-            file = "../images/qgn_plat_inputmet_button_side_disabled.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            file = "../images/qgn_plat_inputmet_button_side_normal.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-        }
-    }
-}
-widget "*.OssoIMSideToggleButton" style "osso-input-method-side-toggle-button"
-widget "*.OssoIMSideToggleButton.GtkLabel" style "osso-input-method-side-toggle-button"
-
-#ordinary keys in vkb and special character view
-style "osso-input-method-vkb-key" = "osso-logical-colors"
-{
-    fg[NORMAL] = "VKBButtonTextColor"
-
-    GtkButton::child_spacing = 0
-    engine "sapwood"
-    {
-        image
-        {
-            function = BOX
-	    state = NORMAL
-            file = "../images/qgn_plat_inputmet_button_key_normal.png"
-            border = { 5, 5, 5, 5 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = PRELIGHT
-            file = "../images/qgn_plat_inputmet_button_key_normal.png"
-            border = { 5, 5, 5, 5 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = INSENSITIVE
-            file = "../images/qgn_plat_inputmet_button_key_disabled.png"
-            border = { 5, 5, 5, 5 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = ACTIVE
-            file = "../images/qgn_plat_inputmet_button_key_pressed.png"
-            border = { 5, 5, 5, 5 }
-            stretch = TRUE
-        }
-    }
-}
-widget "*.osso-im-alpha" style "osso-input-method-vkb-key"
-widget "*.osso-im-numeric" style "osso-input-method-vkb-key"
-widget "*.osso-im-special" style "osso-input-method-vkb-key"
-widget "*.osso-im-space" style "osso-input-method-vkb-key"
-widget "*.osso-im-key" style "osso-input-method-vkb-key"
-widget "*.osso-im-tele" style "osso-input-method-vkb-key"
-widget "*.osso-im-dim" style "osso-input-method-vkb-key"
-			  
-#accent dead keys in vkb
-style "osso-input-method-accent-key" = "osso-logical-colors"
-{
-    fg[NORMAL] = "VKBButtonTextColor"
-
-    engine "sapwood"
-    {
-        image
-        {
-            function = BOX
-	    state = NORMAL
-            file = "../images/qgn_plat_inputmet_button_key_accent_normal.png"
-            border = { 5, 5, 5, 5 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = PRELIGHT
-            file = "../images/qgn_plat_inputmet_button_key_accent_normal.png"
-	    border = { 5, 5, 5, 5 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = ACTIVE
-            file = "../images/qgn_plat_inputmet_button_key_pressed.png"
-	    border = { 5, 5, 5, 5 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = SELECTED
-            file = "../images/qgn_plat_inputmet_button_key_pressed.png"
-            border = { 5, 5, 5, 5 }
-            stretch = TRUE
-	}
-        image
-        {
-            function = BOX
-	    state = INSENSITIVE
-            file = "../images/qgn_plat_inputmet_button_side_disabled.png"
-            border = { 4, 4, 0, 0 }
-            stretch = TRUE
-        }
-
-    }
-}
-widget "*.osso-im-accent" style "osso-input-method-accent-key"
-
-#special character view tabs
-style "osso-input-special-character-view-tabs"
-{
-  GtkNotebook::inner_left_border = 0
-  GtkNotebook::inner_right_border = 0
-  GtkNotebook::tab-overlap = 0
-  GtkNotebook::arrow-spacing = 16
-  GtkNotebook::label-padding = 12
-  GtkWidget::scroll-arrow-hlength = 20
-  GtkWidget::scroll-arrow-vlength = 30
-
-  # Themings for images on different sides of the notebook.
-  engine "sapwood"
-  {
-    # Top theming.
-    image 
-      {
-        function = EXTENSION
-	state    = ACTIVE
-	file     = "../images/qgn_plat_inputmet_tab_special_character_normal.png"
-	border   = { 5, 5, 0, 0 }
-	stretch  = TRUE
-	gap_side = BOTTOM
-      }
-    image
-      {
-        function = EXTENSION
-	file     = "../images/qgn_plat_inputmet_tab_special_character_selected.png"
-	border   = { 5, 5, 0, 0 }
-	stretch  = TRUE
-	gap_side = BOTTOM
-      }
-    # Content area theming when arrows are not present.
-    image
-      {
-        function = BOX_GAP
-	detail   = "notebook" 
-      }
-    # Content area theming when arrows are present.
-    image
-      {
-        function = BOX_GAP
-	detail   = "notebook_show_arrow"
-      }
-      
-    # Arrows left
-    image
-      {
-        function        = ARROW
-        state           = INSENSITIVE
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_notebook_button_previous_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = ARROW
-        shadow          = IN
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_notebook_button_previous_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = ARROW
-        shadow          = OUT
-	arrow_direction = LEFT
-	overlay_file    = "../images/qgn_plat_notebook_button_previous.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    
-    # Arrows right
-    image
-      {
-        function        = ARROW
-        state           = INSENSITIVE
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_notebook_button_next_disabled.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = ARROW
-        shadow          = IN
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_notebook_button_next_pressed.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-    image
-      {
-        function        = ARROW
-        shadow          = OUT
-	arrow_direction = RIGHT
-	overlay_file    = "../images/qgn_plat_notebook_button_next.png"
-	overlay_border  = { 0, 0, 0, 0 }
-	overlay_stretch = TRUE
-      }
-  }
-}
-widget "*.osso-im-scv-tab" style "osso-input-special-character-view-tabs"
-
-#hwr area logical colors
-
-#hwr area mixmode background color
-style "osso-input-method-hwr-area-mixmode-background" = "osso-logical-colors"
-{
-  bg[NORMAL] = "HWRAlphaBackgrdColor"
-}
-widget "*.hildonhwrarea_mix" style "osso-input-method-hwr-area-mixmode-background"
-
-#hwr area punctuationmode background color
-style "osso-input-method-hwr-area-puncmode-background" = "osso-logical-colors"
-{
-  bg[NORMAL] = "HWRPunctBackgrdColor" 
-}
-widget "*.hildonhwrarea_pun" style "osso-input-method-hwr-area-puncmode-background"
-
-#hwr frame image
-style "osso-input-method-hwr-frame"
-{
-    engine "sapwood"
-    {
-        image
-        {
-            function = BOX
-            file = "../images/qgn_plat_inputmet_pane_border.png"
-            border = { 2, 2, 2, 2 }
-            stretch = TRUE
-        }
-    }
-}
-widget "*.OssoIMHWRFrame" style "osso-input-method-hwr-frame"
-
-#word completion maximum length
-style "osso-input-method-word-completion"
-{
-  # 408/491 pixels in normal/fullscreen. 105 pixels for space bar
-  HildonWordCompletion::max-width = 303
-  HildonWordCompletion::max-width-fs = 386
-}
-class "HildonWordCompletion" style "osso-input-method-word-completion"
-
-#word completion prefix button 
-style "osso-input-method-word-completion-prefix-button"
-{
-  engine "sapwood"
-    {
-      image
-	{
-	  function = BOX
-	    state = NORMAL
-	    file = "../images/qgn_plat_inputmet_button_keyboard_word_compl_prefix_normal.png"
-	    border = { 5, 5, 0, 0 }
-	  stretch = TRUE
-	}
-      image
-	{
-	  function = BOX
-	    state = PRELIGHT
-	    file = "../images/qgn_plat_inputmet_button_keyboard_word_compl_prefix_normal.png"
-	    border = { 5, 5, 0, 0 }
-	  stretch = TRUE
-	}
-      image
-	{
-	  function = BOX
-	    state = ACTIVE
-	    file = "../images/qgn_plat_inputmet_button_keyboard_word_compl_pressed.png"
-	    border = { 5, 5, 0, 0 }
-	  stretch = TRUE
-	}
-    }
-}
-widget "*.hildon-wc-prefix-button" style "osso-input-method-word-completion-prefix-button"
-
-#word completion candidate buttons
-style "osso-input-method-word-completion-candidates"
-{
-    engine "sapwood"
-    {
-        image
-        {
-            function = BOX
-	    state = NORMAL
-            file = "../images/qgn_plat_inputmet_button_keyboard_word_compl_normal.png"
-            border = { 5, 5, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-	    state = PRELIGHT
-            file = "../images/qgn_plat_inputmet_button_keyboard_word_compl_normal.png"
-            border = { 5, 5, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = ACTIVE
-            file = "../images/qgn_plat_inputmet_button_keyboard_word_compl_pressed.png"
-            border = { 5, 5, 0, 0 }
-            stretch = TRUE
-        }
-    }
-}
-widget "*.hildon-wc-candidate-button" style "osso-input-method-word-completion-candidates"
-
-#finger keyboard
-widget "*.osso-im-fkb-renderer" style "osso-LargeFont"
-
-style "osso-input-method-fkb-backspace" {
-  engine "sapwood" {
-    image {
-        function = BOX
-        state    = ACTIVE
-	detail   = "buttondefault"
-	file     = "../images/qgn_plat_inputmet_thumb_button_backspace_pressed.png"
-        border   = { 20, 20, 0, 0 }
-        stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail   = "buttondefault"
-	file     = "../images/qgn_plat_inputmet_thumb_button_backspace_normal.png"
-	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-  }
-}
-widget "*.osso-im-fkb-backspace" style "osso-input-method-fkb-backspace"
-
-#finger keyboard "tabs"
-style "osso-input-method-fkb-tab" {
-  engine "sapwood" {
-    image {
-        function = BOX
-	shadow   = IN
-	detail   = "buttondefault"
-	file     = "../images/qgn_plat_inputmet_thumb_tab_selected.png"
-	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail   = "buttondefault"
-	file     = "../images/qgn_plat_inputmet_thumb_tab_normal.png"
-	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-  }
-}
-widget "*.osso-im-fkb-tab" style "osso-input-method-fkb-tab"
-
-#finger keyboard common buttons
-style "osso-input-method-fkb-common-button" {
-  engine "sapwood" {
-    image {
-        function = BOX
-        state    = ACTIVE
-	detail   = "buttondefault"
-	file     = "../images/qgn_plat_inputmet_thumb_button_common_pressed.png"
-        border   = { 20, 20, 0, 0 }
-        stretch  = TRUE
-    }
-    image {
-	function = BOX
-	detail   = "buttondefault"
-	file     = "../images/qgn_plat_inputmet_thumb_button_commom_normal.png"
-	border   = { 20, 20, 0, 0 }
-	stretch  = TRUE
-    }
-  }
-}
-widget "*.osso-im-fkb-common-button" style "osso-input-method-fkb-common-button"
-
-#finger keyboard input keys
-style "osso-input-method-fkb-key" = "osso-logical-colors"
-{
-    fg[NORMAL] = "VKBButtonTextColor"
-
-    GtkButton::child_spacing = 0
-    engine "sapwood"
-    {
-        image
-        {
-            function = BOX
-	    state = NORMAL
-            file = "../images/qgn_plat_inputmet_thumb_button_key_normal.png"
-            border = { 20, 20, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = INSENSITIVE
-            file = "../images/qgn_plat_inputmet_thumb_button_key_disabled.png"
-            border = { 20, 20, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = ACTIVE
-            file = "../images/qgn_plat_inputmet_thumb_button_key_pressed.png"
-            border = { 20, 20, 0, 0 }
-            stretch = TRUE
-        }
-    }
-}
-widget "*osso-im-fkb-key" style "osso-input-method-fkb-key"
-
-#punctuation key in fkb
-style "osso-input-method-fkb-slide-key" {
-    GtkButton::child_spacing = 0
-    engine "sapwood"
-    {
-        image
-        {
-            function = BOX
-	    state = NORMAL
-            file = "../images/qgn_plat_inputmet_thumb_button_extra_normal.png"
-            border = { 20, 20, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-	    state = ACTIVE
-            file = "../images/qgn_plat_inputmet_thumb_button_extra_pressed.png"
-            border = { 20, 20, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = INSENSITIVE
-            file = "../images/qgn_plat_inputmet_thumb_button_extra_disabled.png"
-            border = { 20, 20, 0, 0 }
-            stretch = TRUE
-        }
-    }
-}
-widget "*osso-im-fkb-slide-key" style "osso-input-method-fkb-slide-key"
-
-#space key in fkb
-style "osso-input-method-fkb-whitespace-key" {
-    GtkButton::child_spacing = 0
-    engine "sapwood"
-    {
-        image
-        {
-            function = BOX
-	    state = NORMAL
-            file = "../images/qgn_plat_inputmet_thumb_button_key_space_normal.png"
-            border = { 20, 20, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = ACTIVE
-            file = "../images/qgn_plat_inputmet_thumb_button_key_space_pressed.png"
-            border = { 20, 20, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = INSENSITIVE
-            file = "../images/qgn_plat_inputmet_thumb_button_key_space_disabled.png"
-            border = { 20, 20, 0, 0 }
-            stretch = TRUE
-        }
-    }
-}
-widget "*osso-im-fkb-whitespace-key" style "osso-input-method-fkb-whitespace-key"
-
-#accent dead keys in fkb
-style "osso-input-method-fkb-accent-key" = "osso-logical-colors"
-{
-    fg[NORMAL] = "VKBButtonTextColor"
-
-    engine "sapwood"
-    {
-        image
-        {
-            function = BOX
-	    state = NORMAL
-            file = "../images/qgn_plat_inputmet_thumb_button_key_accent_normal.png"
-            border = { 20, 20, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = ACTIVE
-            file = "../images/qgn_plat_inputmet_thumb_button_key_latched.png"
-            border = { 20, 20, 0, 0 }
-            stretch = TRUE
-        }
-        image
-        {
-            function = BOX
-            state = SELECTED
-            file = "../images/qgn_plat_inputmet_thumb_button_key_latched.png"
-            border = { 20, 20, 0, 0 }
-            stretch = TRUE
-	}
-        image
-        {
-            function = BOX
-            state = INSENSITIVE
-            file = "../images/qgn_plat_inputmet_thumb_button_key_disabled.png"
-            border = { 20, 20, 0, 0 }
-            stretch = TRUE
-        }
-    }
-}
-widget "*osso-im-fkb-accent-key" style "osso-input-method-fkb-accent-key"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildonkeyboard.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildonkeyboard)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigator
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigator	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigator	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,450 +0,0 @@
-
-##############################################
-# Task Navigator Tooltip
-##############################################
-style "osso-task-navigator-tooltip" 
-{
-    engine "sapwood" 
-    {
-        image 
-        {
-            function = FLAT_BOX
-            state = NORMAL
-            file = "../images/qgn_plat_tool_tip.png"	
-	    border = { 20, 20, 20, 20 }
-            stretch = TRUE
-        }
-    }
-}
-
-widget "hildon-task-navigator-tooltip" style "osso-task-navigator-tooltip"
-
-#####################################
-#Temporar theming to the navigator
-#(Just to make it look nice)
-#####################################
-style "osso-navigator-button-one"
-{
-   GtkButton::child_displacement_x = 0
-   GtkButton::child_displacement_y = 0
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			state = NORMAL
-			file = "../images/qgn_plat_task_navigation_button_01_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = PRELIGHT
-			file = "../images/qgn_plat_task_navigation_button_01_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = INSENSITIVE
-			file = "../images/qgn_plat_task_navigation_button_01_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_button_01_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = SELECTED
-			file = "../images/qgn_plat_task_navigation_button_01_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-		        function = FOCUS
-        		file = "../images/qgn_plat_task_navigation_button_01_focused.png"
-        		border = { 0, 0, 0, 0 }
-        		stretch = TRUE
-                }
-	}
-}
-widget "*.hildon-navigator-button-one" style "osso-navigator-button-one"
-
-style "osso-navigator-button-two"
-{
-   GtkButton::child_displacement_x = 0
-   GtkButton::child_displacement_y = 0
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			state = NORMAL
-			file = "../images/qgn_plat_task_navigation_button_02_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = PRELIGHT
-			file = "../images/qgn_plat_task_navigation_button_02_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = INSENSITIVE
-			file = "../images/qgn_plat_task_navigation_button_02_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_button_02_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = SELECTED
-			file = "../images/qgn_plat_task_navigation_button_02_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-		        function = FOCUS
-        		file = "../images/qgn_plat_task_navigation_button_02_focused.png"
-        		border = { 0, 0, 0, 0 }
-        		stretch = TRUE
-                }	
-	}
-}
-widget "*.hildon-navigator-button-two" style "osso-navigator-button-two"
-
-style "osso-navigator-button-three"
-{
-   GtkButton::child_displacement_x = 0
-   GtkButton::child_displacement_y = 0
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			state = NORMAL
-			file = "../images/qgn_plat_task_navigation_button_03_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = PRELIGHT
-			file = "../images/qgn_plat_task_navigation_button_03_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = INSENSITIVE
-			file = "../images/qgn_plat_task_navigation_button_03_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_button_03_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = SELECTED
-			file = "../images/qgn_plat_task_navigation_button_03_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-		        function = FOCUS
-        		file = "../images/qgn_plat_task_navigation_button_03_focused.png"
-        		border = { 0, 0, 0, 0 }
-        		stretch = TRUE
-                }
-	}
-}
-widget "*.hildon-navigator-button-three" style "osso-navigator-button-three"
-
-style "osso-navigator-upper-separator"
-{
-  engine "sapwood"
-    {
-      image
-        {
-	  function = BOX
-	  file     = "../images/qgn_plat_task_navigation_skin_01.png"
-	  border   = { 0, 0, 0, 0 }
-	  stretch  = TRUE
-	}
-    }
-}
-widget "*.hildon-navigator-upper-separator" style "osso-navigator-upper-separator"
-
-style "osso-navigator-lower-separator"
-{
-  engine "sapwood"
-    {
-      image
-        {
-	  function = BOX
-	  file     = "../images/qgn_plat_task_navigation_skin_02.png"
-	  border   = { 0, 0, 0, 0 }
-	  stretch  = TRUE
-	}
-    }
-}
-widget "*.hildon-navigator-lower-separator" style "osso-navigator-lower-separator"
-
-style "osso-navigator-small-button1"
-{
-   GtkButton::child_displacement_x = 0
-   GtkButton::child_displacement_y = 0
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_01_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = FOCUS
-			file = "../images/qgn_plat_task_navigation_application_switcher_01_focused.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}	
-	}
-}
-
-widget "*.hildon-navigator-small-button1" style "osso-navigator-small-button1"
-
-style "osso-navigator-small-button2"
-{
-   GtkButton::child_displacement_x = 0
-   GtkButton::child_displacement_y = 0
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_02_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = FOCUS
-			file = "../images/qgn_plat_task_navigation_application_switcher_02_focused.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}	
-	}
-}
-
-widget "*.hildon-navigator-small-button2" style "osso-navigator-small-button2"
-
-style "osso-navigator-small-button3"
-{
-   GtkButton::child_displacement_x = 0
-   GtkButton::child_displacement_y = 0
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_03_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = FOCUS
-			file = "../images/qgn_plat_task_navigation_application_switcher_03_focused.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}	
-	}
-}
-
-widget "*.hildon-navigator-small-button3" style "osso-navigator-small-button3"
-
-style "osso-navigator-small-button4"
-{
-   GtkButton::child_displacement_x = 0
-   GtkButton::child_displacement_y = 0
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_04_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = FOCUS
-			file = "../images/qgn_plat_task_navigation_application_switcher_04_focused.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}	
-	}
-}
-
-widget "*.hildon-navigator-small-button4" style "osso-navigator-small-button4"
-
-style "osso-navigator-small-button5"
-{   
-   GtkButton::child_displacement_x = 0
-   GtkButton::child_displacement_y = 0
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			state = NORMAL
-			file = "../images/qgn_plat_task_navigation_application_switcher_05_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = PRELIGHT
-			file = "../images/qgn_plat_task_navigation_application_switcher_05_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_application_switcher_05_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = SELECTED
-			file = "../images/qgn_plat_task_navigation_application_switcher_05_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = BOX
-			state = INSENSITIVE
-			file = "../images/qgn_plat_task_navigation_application_switcher_05_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = FOCUS
-			file = "../images/qgn_plat_task_navigation_application_switcher_05_focused.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}	
-	}
-}
-
-widget "*.hildon-navigator-small-button5" style "osso-navigator-small-button5"
-
-
-
-
-style "osso-navigator-small-button1-pressed"
-{
-   GtkButton::child_displacement_x = 0
-   GtkButton::child_displacement_y = 0
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_01_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = FOCUS
-            state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_application_switcher_01_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}	
-	}
-}
-
-widget "*.hildon-navigator-small-button1-pressed" style "osso-navigator-small-button1-pressed"
-
-style "osso-navigator-small-button2-pressed"
-{
-   GtkButton::child_displacement_x = 0
-   GtkButton::child_displacement_y = 0
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_02_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = FOCUS
-            state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_application_switcher_02_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}	
-	}
-}
-
-widget "*.hildon-navigator-small-button2-pressed" style "osso-navigator-small-button2-pressed"
-
-style "osso-navigator-small-button3-pressed"
-{
-   GtkButton::child_displacement_x = 0
-   GtkButton::child_displacement_y = 0
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_03_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = FOCUS
-            state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_application_switcher_03_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}	
-	}
-}
-
-widget "*.hildon-navigator-small-button3-pressed" style "osso-navigator-small-button3-pressed"
-
-style "osso-navigator-small-button4-pressed"
-{
-   GtkButton::child_displacement_x = 0
-   GtkButton::child_displacement_y = 0
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_04_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = FOCUS
-            state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_application_switcher_04_pressed.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}	
-	}
-}
-
-widget "*.hildon-navigator-small-button4-pressed" style "osso-navigator-small-button4-pressed"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigator.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigator)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigatorpopuplist
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigatorpopuplist	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigatorpopuplist	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,62 +0,0 @@
-# Hildon Navigator Popup List
-
-class "GtkWidget" style "osso-logical-colors"
-
-style "osso-popuplist" = "osso-logical-colors"
-{
-
-  GtkTreeView::odd_row_color = "DefaultBackgrdColor"
-  GtkTreeView::even_row_color = "DefaultBackgrdColor"
-  GtkTreeView::expander-size = 0
-  GtkTreeView::expander-indent = 16
-  GtkTreeView::horizontal-separator = 0
-  GtkTreeView::vertical-separator = 0	  
-  GtkTreeView::hildonlike = 1
-  GtkTreeView::passive_focus = 0
-
-  engine "sapwood"
-  {
-    image
-      {
-        function        = CHECK
-        shadow          = OUT
-        state           = NORMAL
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_empty_normal.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = CHECK
-        shadow          = OUT
-        state           = ACTIVE
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_selected_normal.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = CHECK
-        shadow          = OUT
-        state           = SELECTED
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_selected_normal.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }
-    image
-      {
-        function        = CHECK
-        shadow          = OUT
-        state           = INSENSITIVE
-        detail          = "cellcheck"
-        overlay_file    = "../images/qgn_plat_check_box_empty_normal.png"
-        overlay_border  = { 0, 0, 0, 0 }
-        overlay_stretch = FALSE
-      }
-  }
-}
-
-widget_class "HildonNavigatorPopupList.*.GtkTreeView" style "osso-popuplist"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigatorpopuplist.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildonnavigatorpopuplist)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildonnote
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildonnote	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildonnote	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,40 +0,0 @@
-
-style "osso-note-dialog"
-{
-
-  HildonNote::button_spacing = 6
-  HildonNote::content_area_border = 0
-  HildonNote::action_area_border = 10
-  HildonNote::extended_left_border = 0
-  HildonNote::extneded_right_border = 0
-}
-
-class "HildonNote" style "osso-note-dialog"
-
-##################################################
-# Hildon notes
-##################################################
-
-style "osso-note-deleting"
-{
-#      bg_pixmap[NORMAL] = "../delanim.gif"
-}
-widget "hildon-note-deleting" style "osso-note-deleting"
-
-style "osso-infoprint-progress"
-{
-#	  bg_pixmap[NORMAL] = "../proganim.gif"
-}
-widget "hildon-infoprint-progress" style "osso-infoprint-progress"
-
-style "osso-note-question"
-{
-#     bg_pixmap[NORMAL] = "../question.png"
-}
-widget "hildon-note-question" style "osso-note-question"
-
-style "osso-note-information"
-{
-#     bg_pixmap[NORMAL] = "../warning.png"
-}
-widget "hildon-note-information" style "osso-note-information"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildonnote.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildonnote)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildonnumbereditor
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildonnumbereditor	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildonnumbereditor	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,122 +0,0 @@
-
-####################################################
-#HILDON NUMBER EDITOR
-#
-#
-####################################################
-style "osso-number-editor"
-{
-  xthickness = 0
-  ythickness = 0
-}
-class "HildonNumberEditor" style "osso-number-editor"
-
-style "osso-number-editor-plus"
-{
-  GtkButton::default_border = { 0, 0, 0, 0 }
-  GtkButton::child-displacement-y = 0
-  GtkButton::child-displacement-x = 0
-  xthickness = 0
-  ythickness = 0
-
-  engine "sapwood"
-  {
-    image
-  	{
-  	  function = BOX
-          state = NORMAL
-  	  file = "../images/qgn_plat_number_editor_more_normal.png"
-  	  stretch = TRUE
-	  border = {0,0,0,0}
-  	}
-    image
-  	{
-  	  function = BOX
-          state = SELECTED
-  	  file = "../images/qgn_plat_number_editor_more_normal.png"
-  	  stretch = TRUE
-	  border = {0,0,0,0}
-  	}
-    image
-  	{
-  	  function = BOX
-          state = PRELIGHT
-  	  file = "../images/qgn_plat_number_editor_more_normal.png"
-  	  stretch = TRUE
-	  border = {0,0,0,0}
-  	}
-  	image
-  	{
-  	  function = BOX
-          state = INSENSITIVE
-  	  file = "../images/qgn_plat_number_editor_more_disabled.png"
-  	  stretch = TRUE
-	  border = {0,0,0,0}
-  	}
-  	image
-  	{
-  	  function = BOX
-          state = ACTIVE
-  	  file = "../images/qgn_plat_number_editor_more_pressed.png"
-  	  stretch = TRUE
-	  border = {0,0,0,0}
-  	}
-  }
-}
-
-widget "*.ne-plus-button" style "osso-number-editor-plus"
-
-style "osso-number-editor-minus"
-{
-  GtkButton::default_border = { 0, 0, 0, 0 }
-  GtkButton::child-displacement-y = 0
-  GtkButton::child-displacement-x = 0
-  xthickness = 0
-  ythickness = 0
-
-  engine "sapwood"
-  {
-    image
-  	{
-  	  function = BOX
-          state = NORMAL
-  	  file = "../images/qgn_plat_number_editor_less_normal.png"
-  	  stretch = TRUE
-	  border = {0,0,0,0}
-  	}
-    image
-  	{
-  	  function = BOX
-          state = SELECTED
-  	  file = "../images/qgn_plat_number_editor_less_normal.png"
-  	  stretch = TRUE
-	  border = {0,0,0,0}
-  	}
-    image
-  	{
-  	  function = BOX
-          state = PRELIGHT
-  	  file = "../images/qgn_plat_number_editor_less_normal.png"
-  	  stretch = TRUE
-	  border = {0,0,0,0}
-  	}
-  	image
-  	{
-  	  function = BOX
-          state = INSENSITIVE
-  	  file = "../images/qgn_plat_number_editor_less_disabled.png"
-  	  stretch = TRUE
-	  border = {0,0,0,0}
-  	}
-  	image
-  	{
-  	  function = BOX
-          state = ACTIVE
-  	  file = "../images/qgn_plat_number_editor_less_pressed.png"
-  	  stretch = TRUE
-	  border = {0,0,0,0}
-  	}
-  }
-}
-
-widget "*.ne-minus-button" style "osso-number-editor-minus"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildonnumbereditor.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildonnumbereditor)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildonseekbar
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildonseekbar	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildonseekbar	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,365 +0,0 @@
-
-#################################################### 
-# HILDON SEEKBAR
-# 
-# Theming instructions for HildonSeekBar -widget
-#
-# NOTE: hildon-lgpl is needed for theming of display 
-#       component 
-#
-#################################################### 
-
-style "osso-seekbar"
-{
-	HildonSeekbar::stepper_size = 26
-	HildonSeekbar::stepper_spacing = 6
-	HildonSeekbar::trough_border = 0
-	HildonSeekbar::slider_width = 58
-	HildonSeekbar::slider_length = 23
-        HildonSeekbar::focus-line-width = 0
-        HildonSeekbar::focus-padding = 0
-	HildonSeekbar::hildonlike = 1
-        HildonSeekbar::autodimmed_steppers = 1
-	HildonSeekbar::draw_trough_under_steppers = 0
-        HildonSeekbar::two_part_trough = 1
-	GtkRange::arrow_paint_box_layout = 1
-	GtkRange::stream_indicator_padding = 3
-	
-	engine "sapwood" {
-		#
-		# At first, lets override some gtkrange specific things
-		#
-      		image {
-	 		function = BOX
-			detail = "stepper"
-      		}
-
-                image {
-                        function = BOX
-                        detail = "seekbar"
-                        state = INSENSITIVE
-                        file = "../images/qgn_plat_seek_bar_regular_background_disabled.png"
-                        border = { 20, 20, 18, 20 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "seekbar"
-                        state = NORMAL
-                        file = "../images/qgn_plat_seek_bar_regular_background_normal.png"
-                        border = { 20, 20, 18, 20 }
-                        stretch = TRUE
-                }
-		
-                image {
-                        function = BOX
-                        detail = "trough_northwest"
-                        state = INSENSITIVE
-                        file = "../images/qgn_plat_seek_bar_regular_shaft_left_disabled.png"
-                        border = { 4, 0, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_stream"
-                        state = INSENSITIVE
-                        file = "../images/qgn_plat_seek_bar_regular_shaft_stream_disabled.png"
-                        border = { 0, 2, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_stream_complete"
-                        state = INSENSITIVE
-                        file = "../images/qgn_plat_seek_bar_regular_shaft_stream_finished_disabled.png"
-                        border = { 0, 2, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_southeast"
-                        state = INSENSITIVE
-                        file = "../images/qgn_plat_seek_bar_regular_shaft_right_disabled.png"
-                        border = { 0, 4, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_northwest"
-                        file = "../images/qgn_plat_seek_bar_regular_shaft_left_normal.png"
-                        border = { 4, 0, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_stream"
-                        file = "../images/qgn_plat_seek_bar_regular_shaft_stream_normal.png"
-                        border = { 0, 2, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_stream_complete"
-                        file = "../images/qgn_plat_seek_bar_regular_shaft_stream_finished_normal.png"
-                        border = { 0, 2, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_southeast"
-                        file = "../images/qgn_plat_seek_bar_regular_shaft_right_normal.png"
-                        border = { 0, 4, 0, 0 }
-                        stretch = TRUE
-                }
-
-                image {
-                        function = SLIDER
-                        detail = "slider"
-                        orientation = HORIZONTAL
-                        state = INSENSITIVE
-                        file = "../images/qgn_plat_seek_bar_regular_thumb_disabled.png"
-                }
-                image {
-                        function = SLIDER
-                        detail = "slider"
-                        orientation = HORIZONTAL
-                        file = "../images/qgn_plat_seek_bar_regular_thumb_normal.png"
-                }
-
-                #left
-        	image {
-			function        = ARROW
-			state           = ACTIVE
-			arrow_direction = LEFT
-			overlay_file    = "../images/qgn_plat_seek_bar_regular_backward_button_pressed.png"
-			overlay_stretch = FALSE
-		}
-		image {
-			function        = ARROW
-			state           = SELECTED
-			arrow_direction = LEFT
-			overlay_file    = "../images/qgn_plat_seek_bar_regular_backward_button_pressed.png"
-			overlay_stretch = FALSE
-		}
-		image {
-			function        = ARROW
-			state           = INSENSITIVE
-			arrow_direction = LEFT
-			overlay_file    = "../images/qgn_plat_seek_bar_regular_backward_button_disabled.png"
-			overlay_stretch = FALSE
-		}
-		image {
-			function        = ARROW
-			arrow_direction = LEFT
-			overlay_file    = "../images/qgn_plat_seek_bar_regular_backward_button_normal.png"
-			overlay_stretch = FALSE
-		}
-
-		#right
-		image {
-			function        = ARROW
-        		state           = ACTIVE
-			arrow_direction = RIGHT
-		        overlay_file    = "../images/qgn_plat_seek_bar_regular_forward_button_pressed.png"
-			overlay_stretch = FALSE
-		}
-		image {
-        		function        = ARROW
-			state           = SELECTED
-			arrow_direction = RIGHT
-			overlay_file    = "../images/qgn_plat_seek_bar_regular_forward_button_pressed.png"
-			overlay_stretch = FALSE
-		}
-                image {
-			function        = ARROW
-			state           = INSENSITIVE
-			arrow_direction = RIGHT
-			overlay_file    = "../images/qgn_plat_seek_bar_regular_forward_button_disabled.png"
-			overlay_stretch = FALSE
-		}
-		image {
-			function        = ARROW
-			arrow_direction = RIGHT
-			overlay_file    = "../images/qgn_plat_seek_bar_regular_forward_button_normal.png"
-			overlay_stretch = FALSE
-		}
-	}
-}
-class "HildonSeekbar" style "osso-seekbar"
-
-style "osso-seekbar-toolbar"
-{
-	HildonSeekbar::stepper_size = 26
-	HildonSeekbar::stepper_spacing = 6
-	HildonSeekbar::trough_border = 0
-	HildonSeekbar::slider_width = 40
-	HildonSeekbar::slider_length = 23
-        HildonSeekbar::focus-line-width = 0
-        HildonSeekbar::focus-padding = 0
-	HildonSeekbar::hildonlike = 1
-        HildonSeekbar::autodimmed_steppers = 1
-	HildonSeekbar::draw_trough_under_steppers = 0
-        HildonSeekbar::two_part_trough = 1
-	GtkRange::stream_indicator_padding = 3
-		
-	engine "sapwood" {
-		#
-		# At first, lets override some gtkrange specific things
-		#
-      		image {
-	 		function = BOX
-			detail = "stepper"
-      		}
-
-                image {
-                        function = BOX
-                        detail = "seekbar"
-                        state = INSENSITIVE
-                        file = "../images/qgn_plat_seek_bar_toolbar_background_disabled.png"
-                        border = { 20, 20, 19, 19 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "seekbar"
-                        state = NORMAL
-                        file = "../images/qgn_plat_seek_bar_toolbar_background_normal.png"
-                        border = { 20, 20, 19, 19 }
-                        stretch = TRUE
-                }
-
-                image {
-                        function = BOX
-                        detail = "trough_northwest"
-                        state = INSENSITIVE
-                        file = "../images/qgn_plat_seek_bar_toolbar_shaft_left_disabled.png"
-                        border = { 4, 0, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_stream"
-                        state = INSENSITIVE
-                        file = "../images/qgn_plat_seek_bar_toolbar_shaft_stream_disabled.png"
-                        border = { 0, 2, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_stream_completete"
-                        state = INSENSITIVE
-                        file = "../images/qgn_plat_seek_bar_toolbar_shaft_stream_finished_disabled.png"
-                        border = { 0, 2, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_southeast"
-                        state = INSENSITIVE
-                        file = "../images/qgn_plat_seek_bar_toolbar_shaft_right_disabled.png"
-                        border = { 0, 4, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_northwest"
-                        file = "../images/qgn_plat_seek_bar_toolbar_shaft_left_normal.png"
-                        border = { 4, 0, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_stream"
-                        file = "../images/qgn_plat_seek_bar_toolbar_shaft_stream_normal.png"
-                        border = { 0, 2, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_stream_complete"
-                        file = "../images/qgn_plat_seek_bar_toolbar_shaft_stream_finished_normal.png"
-                        border = { 0, 2, 0, 0 }
-                        stretch = TRUE
-                }
-                image {
-                        function = BOX
-                        detail = "trough_southeast"
-                        file = "../images/qgn_plat_seek_bar_toolbar_shaft_right_normal.png"
-                        border = { 0, 4, 0, 0 }
-                        stretch = TRUE
-                }
-
-                image {
-                        function = SLIDER
-                        detail = "slider"
-                        orientation = HORIZONTAL
-                        state = INSENSITIVE
-                        file = "../images/qgn_plat_seek_bar_toolbar_thumb_disabled.png"
-                }
-                image {
-                        function = SLIDER
-                        detail = "slider"
-                        orientation = HORIZONTAL
-                        file = "../images/qgn_plat_seek_bar_toolbar_thumb_normal.png"
-                }
-
-                #left
-        	image {
-			function        = ARROW
-			state           = ACTIVE
-			arrow_direction = LEFT
-			overlay_file    = "../images/qgn_plat_seek_bar_toolbar_backward_button_pressed.png"
-			overlay_stretch = FALSE
-		}
-		image {
-			function        = ARROW
-			state           = SELECTED
-			arrow_direction = LEFT
-			overlay_file    = "../images/qgn_plat_seek_bar_toolbar_backward_button_pressed.png"
-			overlay_stretch = FALSE
-		}
-		image {
-			function        = ARROW
-			state           = INSENSITIVE
-			arrow_direction = LEFT
-			overlay_file    = "../images/qgn_plat_seek_bar_toolbar_backward_button_disabled.png"
-			overlay_stretch = FALSE
-		}
-		image {
-			function        = ARROW
-			arrow_direction = LEFT
-			overlay_file    = "../images/qgn_plat_seek_bar_toolbar_backward_button_normal.png"
-			overlay_stretch = FALSE
-		}
-
-		#right
-		image {
-			function        = ARROW
-        		state           = ACTIVE
-			arrow_direction = RIGHT
-		        overlay_file    = "../images/qgn_plat_seek_bar_toolbar_forward_button_pressed.png"
-			overlay_stretch = FALSE
-		}
-		image {
-        		function        = ARROW
-			state           = SELECTED
-			arrow_direction = RIGHT
-			overlay_file    = "../images/qgn_plat_seek_bar_toolbar_forward_button_pressed.png"
-			overlay_stretch = FALSE
-		}
-                image {
-			function        = ARROW
-			state           = INSENSITIVE
-			arrow_direction = RIGHT
-			overlay_file    = "../images/qgn_plat_seek_bar_toolbar_forward_button_disabled.png"
-			overlay_stretch = FALSE
-		}
-		image {
-			function        = ARROW
-			arrow_direction = RIGHT
-			overlay_file    = "../images/qgn_plat_seek_bar_toolbar_forward_button_normal.png"
-			overlay_stretch = FALSE
-		}
-	}
-}
-widget_class "*.GtkToolbar.GtkToolItem.HildonSeekbar" style "osso-seekbar-toolbar"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildonseekbar.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildonseekbar)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildonstatusbar
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildonstatusbar	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildonstatusbar	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,88 +0,0 @@
-#################################################### 
-# HILDON status bar
-#################################################### 
-
-style "osso-status-bar-background" {
-	bg_pixmap[NORMAL] = "../images/qgn_plat_status_bar_background.png"
-}
-widget "HildonStatusBar" style "osso-status-bar-background"
-
-style "osso-status-bar-extension-background" {
-    engine "sapwood" 
-    {
-        image 
-        {
-            function = FLAT_BOX
-            state = NORMAL
-            file = "../images/qgn_plat_status_bar_second_level_background.png"
-	        border = { 0, 0, 39, 9 }
-            stretch = TRUE
-        }
-    }
-}
-widget "HildonStatusBarExtension" style "osso-status-bar-extension-background"
-
-style "osso-status-bar-button" {
-  GtkButton::default_border = { 0, 0, 0, 0 }
-  GtkButton::default_outside_border = { 0, 0, 0, 0 }
-  GtkButton::child_spacing = 0
-  xthickness = 0
-  ythickness = 0
-  engine "sapwood" {
-    image {
-      function = BOX
-      state = ACTIVE
-      file = "../images/qgn_plat_status_bar_pressed.png"
-    }
-    image {
-      function = BOX
-    }
-  }
-}
-widget "*.HildonStatusBarItem" style "osso-status-bar-button"
-
-#
-# Statusbar popup menus
-#
-
-style "osso-status-bar-popup" 
-{
-
-   GtkMenu::horizontal_padding = 18
-   GtkMenu::vertical_padding = 18
-
-    engine "sapwood" 
-    {
-        image 
-        {
-            function = FLAT_BOX
-            state = NORMAL
-            file = "../images/qgn_plat_application_menu_lower_level_frame.png"
-	        border = { 20, 20, 20, 20 }
-            stretch = TRUE
-            shaped = TRUE
-        }
-    }
-}
-
-widget "hildon-status-bar-popup" style "osso-status-bar-popup"
-
-#################################################### 
-# HILDON statusbar
-#################################################### 
-
-style "osso-frame-statusbar" {
-
-   GtkFrame::hildonlike = 1
-
-   engine "sapwood" {
-      image {
-    	 function = BOX
-         state = NORMAL
-	     file = "../images/qgn_plat_status_bar_background.png"	
-	     border = { 0,0,0,0 }	
-	     stretch = TRUE
-      }
-   }
-}
-widget "*.hildonframe-statusbar" style "osso-frame-statusbar"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildonstatusbar.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildonstatusbar)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildontimeeditor
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildontimeeditor	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildontimeeditor	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,95 +0,0 @@
-#################################################### 
-# HILDON TIME EDITOR
-#
-# Copyright 2005 Nokia Oyj
-#
-# This disables default button graphics from
-# the time editor button.
-#
-####################################################
-
-style "osso-time-editor-button"
-{
-  GtkButton::default_border = { 0, 0, 0, 0 }
-  GtkButton::child-displacement-y = 2
-  GtkButton::child-displacement-x = 2
-  GtkWidget::focus-width = 0
-  GtkButton::interior_focus = 0
-  GtkButton::child_spacing = 0
-
-  engine "sapwood"
-    {
-      image
-        {
-	  function = BOX
-	}
-    }
-}
-
-style "osso-time-editor-ampm-button"
-{
-  xthickness = 1
-  ythickness = 1
-
-  engine "sapwood"
-    {
-    image {
-        function = FOCUS
-        file     = "../images/qgn_plat_single_line_input.png"
-        border   = {2, 2, 2, 2}
-        stretch  = TRUE
-    }
-    image {
-        function = BOX
-        border = { 2, 2, 2, 2 }
-        file     = "../images/qgn_plat_single_line_input.png"
-        stretch  = TRUE
-    }
-  }
-}
-
-style "osso-time-editor"
-{
-   GtkFrame::hildonlike = 1
-   GtkEntry::hildonlike = 1
-   GtkEntry::horizontal-border = 2
-   GtkEntry::vertical-border = 0
-   xthickness = 0
-   ythickness = 0
-}
-
-widget_class "*.HildonTimeEditor.GtkFrame.*.GtkButton" style "osso-time-editor-ampm-button"
-widget_class "*.HildonTimeEditor.GtkButton" style "osso-time-editor-button"
-
-style "osso-time-editor-frame"
-{
-  GtkFrame::hildonlike = 1
-
-  ythickness = 1
-  xthickness = 1
-
-  engine "sapwood"
-    {
-      image
-        {
-          function = BOX
-          state = INSENSITIVE
-          file = "../images/qgn_plat_single_line_input_disabled.png"
-          border = { 2, 2, 2, 2 }
-          stretch = TRUE
-        }
-    }
-
-  engine "sapwood"
-    {
-      image
-        {
-          function = BOX
-          file = "../images/qgn_plat_single_line_input.png"
-          border = { 2, 2, 2, 2 }
-          stretch = TRUE
-        }
-    }
-}
-
-widget_class "*.HildonTimeEditor.GtkFrame" style "osso-time-editor-frame"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildontimeeditor.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildontimeeditor)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildontimepicker
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildontimepicker	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildontimepicker	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,59 +0,0 @@
-####################################################  
-# Hildon Time Picker
-#
-#
-#################################################### 
-
-style "osso-time-picker-arrows" {
-
-  engine "sapwood" {
-    image {
-      function = BOX
-      detail = "osso_button_n"
-      state = ACTIVE
-      file = "../images/qgn_plat_arrow_up_pressed.png"
-    }
-    image {
-      function = BOX
-      detail = "osso_button_n"
-      file = "../images/qgn_plat_arrow_up_normal.png"
-    }
-    image {
-      function = BOX
-      detail = "osso_button_s"
-      state = ACTIVE
-      file = "../images/qgn_plat_arrow_down_pressed.png"
-    }
-    image {
-      function = BOX
-      detail = "osso_button_s"
-      file = "../images/qgn_plat_arrow_down_normal.png"
-    }
-  }
-}
-widget_class "HildonTimePicker.GtkVBox.GtkAlignment.GtkTable.GtkButton" style "osso-time-picker-arrows"
-
-style "osso-time-picker-ebox" {
-      xthickness = 0
-      ythickness = 0
-
-      engine "sapwood" {
-         image {
-            function = FLAT_BOX
-	    state = SELECTED
-            file = "../images/qgn_plat_focus_active.png"
-            border = { 2, 2, 2, 2 }
-            stretch = TRUE
-         }
-         image {
-            function = FLAT_BOX
-         }
-      }
-}
-widget_class "HildonTimePicker.GtkVBox.GtkAlignment.GtkTable.GtkFrame.GtkEventBox" style "osso-time-picker-ebox"
-widget_class "HildonTimePicker.GtkVBox.GtkAlignment.GtkTable.GtkAlignment.GtkFrame.GtkEventBox" style "osso-time-picker-ebox"
-
-widget_class "HildonTimePicker.GtkVBox.GtkAlignment.GtkTable.GtkLabel" style "osso-LargeFont"
-widget_class "HildonTimePicker.GtkVBox.GtkAlignment.GtkTable.GtkFrame.GtkEventBox.GtkLabel" style "osso-LargeFont"
-widget_class "HildonTimePicker.GtkVBox.GtkAlignment.GtkHButtonBox.GtkButton.GtkLabel" style "osso-ButtonFont"
-widget_class "HildonTimePicker.GtkVBox.GtkAlignment.GtkTable.GtkAlignment.GtkFrame.GtkEventBox.GtkLabel" style "osso-SystemFont"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildontimepicker.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildontimepicker)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildonvolumebar
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildonvolumebar	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildonvolumebar	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,600 +0,0 @@
-####################################################
-# HILDON VOLUMEBAR
-#
-# Theming instructions for HildonSeekBar -widget
-#
-# NOTE: Different theming instructions for horizontal
-#	and vertical versions
-#
-# NOTE: Stepper arrows have to be themed specially
-# 	for vertical volumebar
-#
-####################################################
-
-style "osso-volumebar-horizontal"
-{
-  HildonVolumebarRange::stepper_size = 26
-  HildonVolumebarRange::stepper_spacing = 0
-  HildonVolumebarRange::slider_width = 58
-  HildonVolumebarRange::slider_length = 23
-  HildonVolumebarRange::focus_line_width = 0
-  HildonVolumebarRange::focus_padding = 0
-  HildonVolumebarRange::stepper_spacing = 6
-  HildonVolumebarRange::arrow_displacement_x = 0
-  HildonVolumebarRange::arrow_displacement_y = 0
-  HildonVolumebarRange::trough_border = 0
-  HildonVolumebarRange::hildonlike = 1
-  HildonVolumebarRange::value_spacing = 0
-  HildonVolumebarRange::autodimmed_steppers = 1
-  HildonVolumebarRange::two_part_trough = 1
-  HildonVolumebarRange::draw_trough_under_steppers = 0
-  
-  engine "sapwood"
-  {
-    image
-    {
-      function = BOX
-      detail = "background"
-      state = NORMAL
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_background_normal.png"
-      border = {20, 20, 28, 28}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "background"
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_background_disabled.png"
-      border = {20, 20, 28, 28}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "stepper"
-    }
-    image
-    {
-      function = BOX
-      detail = "trough_northwest"
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_shaft_left_disabled.png"
-      border = {4, 0, 0, 0}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "trough_northwest"
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_shaft_left_normal.png"
-      border = {4, 0, 0, 0}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "trough_southeast"
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_shaft_right_disabled.png"
-      border = {0, 4, 0, 0}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "trough_southeast"
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_shaft_right_normal.png"
-      border = {0, 4, 0, 0}
-      stretch = TRUE
-    }
-    image
-    {
-      function = SLIDER
-      detail = "slider"
-      orientation = HORIZONTAL
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_thumb_disabled.png"
-    }
-    image
-    {
-      function = SLIDER
-      detail = "slider"
-      orientation = HORIZONTAL
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_thumb_normal.png"
-    }
-    image
-    {
-      function = ARROW
-      arrow_direction = LEFT
-      state = INSENSITIVE
-      overlay_file = "../images/qgn_plat_volume_bar_horizontal_regular_less_button_disabled.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      state = ACTIVE
-      arrow_direction = LEFT
-      overlay_file = "../images/qgn_plat_volume_bar_horizontal_regular_less_button_pressed.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      arrow_direction = LEFT
-      overlay_file = "../images/qgn_plat_volume_bar_horizontal_regular_less_button_normal.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      arrow_direction = RIGHT
-      state = INSENSITIVE
-      overlay_file = "../images/qgn_plat_volume_bar_horizontal_regular_more_button_disabled.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      state = ACTIVE
-      arrow_direction = RIGHT
-      overlay_file = "../images/qgn_plat_volume_bar_horizontal_regular_more_button_pressed.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      arrow_direction = RIGHT
-      overlay_file = "../images/qgn_plat_volume_bar_horizontal_regular_more_button_normal.png"
-      overlay_stretch = FALSE
-    }
-  }
-}
-class "HildonHVolumebar" style "osso-volumebar-horizontal" 
-widget_class "*.HildonHVolumebar.HildonVolumebarRange" style "osso-volumebar-horizontal"
-
-style "osso-volumebar-horizontal-mutebutton"
-{
-
-  GtkWidget::focus_line_pattern = "\0\0\0\0\0\0\0\0"
-  
-  engine "sapwood"
-  {
-    image
-    {
-      function = BOX
-      shadow = OUT
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_mute_button_disabled.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      shadow = OUT
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_mute_button_normal.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      shadow = IN
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_mute_button_disabled_pressed.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      shadow = IN
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_mute_button_pressed.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_mute_button_disabled_pressed.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      file = "../images/qgn_plat_volume_bar_horizontal_regular_mute_button_pressed.png"
-      stretch = TRUE
-    }
-  }
-}
-widget_class "*.HildonHVolumebar.GtkToggleButton" style "osso-volumebar-horizontal-mutebutton"
-
-style "osso-volumebar-vertical"
-{
-  HildonVolumebarRange::stepper_size = 26
-  HildonVolumebarRange::slider_width = 58
-  HildonVolumebarRange::slider_length = 23
-  HildonVolumebarRange::focus_line_width = 0
-  HildonVolumebarRange::focus_padding = 0
-  HildonVolumebarRange::stepper_spacing = 6
-  HildonVolumebarRange::arrow_displacement_x = 0
-  HildonVolumebarRange::arrow_displacement_y = 0
-  HildonVolumebarRange::trough_border = 0
-  HildonVolumebarRange::hildonlike = 1
-  HildonVolumebarRange::value_spacing = 0
-  HildonVolumebarRange::autodimmed_steppers = 1
-  HildonVolumebarRange::two_part_trough = 1 
-  HildonVolumebarRange::draw_trough_under_steppers = 0
-  
-  engine "sapwood"
-  {
-    image
-    {
-      function = BOX
-      detail = "background"
-      state = NORMAL
-      file = "../images/qgn_plat_volume_bar_vertical_regular_background_normal.png"
-      border = {28, 28, 20, 20}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "background"
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_vertical_regular_background_disabled.png"
-      border = {28, 28, 20, 20}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "stepper"
-    }
-    image
-    {
-      function = BOX
-      detail = "trough_northwest"
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_vertical_regular_shaft_top_disabled.png"
-      border = {0, 0, 4, 0}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "trough_northwest"
-      file = "../images/qgn_plat_volume_bar_vertical_regular_shaft_top_normal.png"
-      border = {0, 0, 4, 0}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "trough_southeast"
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_vertical_regular_shaft_bottom_disabled.png"
-      border = {0, 0, 0, 4}
-      stretch = TRUE}
-    image
-    {
-      function = BOX
-      detail = "trough_southeast"
-      file = "../images/qgn_plat_volume_bar_vertical_regular_shaft_bottom_normal.png"
-      border = {0, 0, 0, 4}
-      stretch = TRUE
-    }
-    image
-    {
-      function = SLIDER
-      detail = "slider"
-      orientation = VERTICAL
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_vertical_regular_thumb_disabled.png"
-    }
-    image
-    {
-      function = SLIDER
-      detail = "slider"
-      orientation = VERTICAL
-      file = "../images/qgn_plat_volume_bar_vertical_regular_thumb_normal.png"
-    }
-    image
-    {
-      function = ARROW
-      arrow_direction = UP
-      state = INSENSITIVE
-      overlay_file = "../images/qgn_plat_volume_bar_vertical_regular_more_button_disabled.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      state = ACTIVE
-      arrow_direction = UP
-      overlay_file = "../images/qgn_plat_volume_bar_vertical_regular_more_button_pressed.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      arrow_direction = UP
-      overlay_file = "../images/qgn_plat_volume_bar_vertical_regular_more_button_normal.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      arrow_direction = DOWN
-      state = INSENSITIVE
-      overlay_file = "../images/qgn_plat_volume_bar_vertical_regular_less_button_disabled.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      state = ACTIVE
-      arrow_direction = DOWN
-      overlay_file = "../images/qgn_plat_volume_bar_vertical_regular_less_button_pressed.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      arrow_direction = DOWN
-      overlay_file = "../images/qgn_plat_volume_bar_vertical_regular_less_button_normal.png"
-      overlay_stretch = FALSE
-    }
-  }
-}
-class "HildonVVolumebar" style "osso-volumebar-vertical"
-widget_class "*.HildonVVolumebar.HildonVolumebarRange" style "osso-volumebar-vertical"
-
-style "osso-volumebar-vertical-mutebutton"
-{
-
-  GtkWidget::focus_line_pattern = "\0\0\0\0\0\0\0\0"
-  
-  engine "sapwood"
-  {
-    image
-    {
-      function = BOX
-      shadow = OUT
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_vertical_regular_mute_button_disabled.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      shadow = OUT
-      file = "../images/qgn_plat_volume_bar_vertical_regular_mute_button_normal.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      shadow = IN
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_vertical_regular_mute_button_disabled_pressed.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      shadow = IN
-      file = "../images/qgn_plat_volume_bar_vertical_regular_mute_button_pressed.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_vertical_regular_mute_button_disabled_pressed.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      file = "../images/qgn_plat_volume_bar_vertical_regular_mute_button_pressed.png"
-      stretch = TRUE
-    }
-  }
-}
-widget_class "*.HildonVVolumebar.GtkToggleButton" style "osso-volumebar-vertical-mutebutton"
-
-style "osso-volumebar-toolbar"
-{
-  HildonVolumebarRange::stepper_size = 26
-  HildonVolumebarRange::slider_width = 40
-  HildonVolumebarRange::slider_length = 23
-  HildonVolumebarRange::focus_line_width = 0
-  HildonVolumebarRange::focus_padding = 0
-  HildonVolumebarRange::stepper_spacing = 6
-  HildonVolumebarRange::arrow_displacement_x = 0
-  HildonVolumebarRange::arrow_displacement_y = 0
-  HildonVolumebarRange::trough_border = 0
-  HildonVolumebarRange::hildonlike = 1
-  HildonVolumebarRange::value_spacing = 0
-  HildonVolumebarRange::autodimmed_steppers = 1
-  HildonVolumebarRange::two_part_trough = 1 
-  HildonVolumebarRange::draw_trough_under_steppers = 0
-  
-  engine "sapwood"
-  {
-    image
-    {
-      function = BOX
-      detail = "background"
-      state = NORMAL
-      file = "../images/qgn_plat_volume_bar_toolbar_background_normal.png"
-      border = {20, 20, 18, 18}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "background"
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_toolbar_background_disabled.png"
-      border = {20, 20, 18, 18}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "stepper"
-    }
-    image
-    {
-      function = BOX
-      detail = "trough_northwest"
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_toolbar_shaft_left_disabled.png"
-      border = {4, 0, 0, 0}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "trough_northwest"
-      file = "../images/qgn_plat_volume_bar_toolbar_shaft_left_normal.png"
-      border = {4, 0, 0, 0}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "trough_southeast"
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_toolbar_shaft_right_disabled.png"
-      border = {0, 4, 0, 0}
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      detail = "trough_southeast"
-      file = "../images/qgn_plat_volume_bar_toolbar_shaft_right_normal.png"
-      border = {0, 4, 0, 0}
-      stretch = TRUE
-    }
-    image
-    {
-      function = SLIDER
-      detail = "slider"
-      orientation = HORIZONTAL
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_toolbar_thumb_disabled.png"
-    }
-    image
-    {
-      function = SLIDER
-      detail = "slider"
-      orientation = HORIZONTAL
-      file = "../images/qgn_plat_volume_bar_toolbar_thumb_normal.png"
-    }
-    image
-    {
-      function = ARROW
-      arrow_direction = LEFT
-      state = INSENSITIVE
-      overlay_file = "../images/qgn_plat_volume_bar_toolbar_less_button_disabled.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      state = ACTIVE
-      arrow_direction = LEFT
-      overlay_file = "../images/qgn_plat_volume_bar_toolbar_less_button_pressed.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      arrow_direction = LEFT
-      overlay_file = "../images/qgn_plat_volume_bar_toolbar_less_button_normal.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      arrow_direction = RIGHT
-      state = INSENSITIVE
-      overlay_file = "../images/qgn_plat_volume_bar_toolbar_more_button_disabled.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      state = ACTIVE
-      arrow_direction = RIGHT
-      overlay_file = "../images/qgn_plat_volume_bar_toolbar_more_button_pressed.png"
-      overlay_stretch = FALSE
-    }
-    image
-    {
-      function = ARROW
-      arrow_direction = RIGHT
-      overlay_file = "../images/qgn_plat_volume_bar_toolbar_more_button_normal.png"
-      overlay_stretch = FALSE
-    }
-  }
-}
-widget_class "*.GtkToolbar.GtkToolItem.HildonHVolumebar" style "osso-volumebar-toolbar"
-widget_class "*.GtkToolbar.GtkToolItem.HildonHVolumebar.HildonVolumebarRange" style "osso-volumebar-toolbar" 
-
-style "osso-volumebar-toolbar-mutebutton"
-{
-
-  GtkWidget::focus_line_pattern = "\0\0\0\0\0\0\0\0"
-  
-  engine "sapwood"
-  {
-    image
-    {
-      function = BOX
-      shadow = OUT
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_toolbar_mute_button_disabled.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      shadow = OUT
-      file = "../images/qgn_plat_volume_bar_toolbar_mute_button_normal.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      shadow = IN
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_toolbar_mute_button_disabled_pressed.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = BOX
-      shadow = IN
-      file = "../images/qgn_plat_volume_bar_toolbar_mute_button_pressed.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      state = INSENSITIVE
-      file = "../images/qgn_plat_volume_bar_toolbar_mute_button_disabled_pressed.png"
-      stretch = TRUE
-    }
-    image
-    {
-      function = FOCUS
-      file = "../images/qgn_plat_volume_bar_toolbar_mute_button_pressed.png"
-      stretch = TRUE
-    }
-  }
-}
-widget_class "*.GtkToolbar.GtkToolItem.HildonHVolumebar.GtkToggleButton" style "osso-volumebar-toolbar-mutebutton"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildonvolumebar.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildonvolumebar)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/hildonweekdaypicker
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/hildonweekdaypicker	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/hildonweekdaypicker	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,30 +0,0 @@
-########################################################
-# Hildon Weekday Picker
-########################################################
-
-style "osso-weekday" {
-
-    xthickness = 6
-    ythickness = 4
-    
-    engine "sapwood" {
-        image {
-             function = BOX
-             state = NORMAL
-             file = "../images/qgn_plat_weekday_picker_normal.png"
-             border = { 2, 2, 0, 0 }
-             stretch = TRUE
-       }
-       image {
-            function = BOX
-            state = ACTIVE
-            file = "../images/qgn_plat_weekday_picker_pressed.png"
-            border = { 2, 2, 0, 0}
-            stretch = TRUE
-       }
-    }
-}
-
-widget_class "*.HildonWeekdayPicker.GtkToggleButton" style "osso-weekday"
-
-widget_class "*.HildonWeekdayPicker.GtkToggleButton.GtkLabel" style "osso-SmallFont"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/hildonweekdaypicker.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/hildonweekdaypicker)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/ossoapplicationinstaller
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/ossoapplicationinstaller	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/ossoapplicationinstaller	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,24 +0,0 @@
-###
-#
-# The Application installer main view background image
-# 
-# The image will not be tiled if it doesn't cover the whole window;
-# it will be placed in the lower right corner.
-# 
-# Because this behavior is not directly supported by the theming
-# machinery, the Application installer renders the background image
-# itself.  What pixmap to render is specified here, but in a hackish
-# way: the render code in the Application installer will look into
-# bg_pixmap[ACTIVE] to find the pixmap, and will render it always,
-# independent of the state of the widget.
-# 
-# A proper solution would be to have symbolic image filenames.
-#
-###
-
-style "osso-application-installer-main-view"
-{
-  bg_pixmap[ACTIVE] = "../images/qgn_plat_application_installer_image.png"
-}
-
-widget "*.osso-application-installer-main-view" style "osso-application-installer-main-view"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/ossoapplicationinstaller.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/ossoapplicationinstaller)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/ossoclock
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/ossoclock	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/ossoclock	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,112 +0,0 @@
-####################################################
-# OSSO CLOCK APPLET
-#
-# Copyright 2005 Nokia Oyj
-#
-#
-####################################################
-style "osso-clock"
-{
-  GtkFrame::hildonlike = 1
-  xthickness = 0
-  ythickness = 0
-
-  engine "sapwood"
-    {
-      image
-        {
-          function = BOX
-          file     = "../images/qgn_plat_gene_applet_bg.png"
-          border   = { 25, 25, 25, 25 }
-          stretch  = TRUE
-        }
-    }
-}
-widget "*.osso-clock" style "osso-clock"
-
-
-style "osso-clock-analog-am" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_analog_am.png"
-}
-widget "osso-clock-widget-clockbg-am" style "osso-clock-analog-am"
-
-style "osso-clock-analog-plain" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_analog_plain.png"
-}
-widget "osso-clock-widget-clockbg" style "osso-clock-analog-plain"
-
-style "osso-clock-analog-pm" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_analog_pm.png"
-}
-widget "osso-clock-widget-clockbg-pm" style "osso-clock-analog-pm"
-
-style "osso-clock-digital-display-number-0" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_display_number_0.png"
-}
-widget "osso-clock-widget-digit-0" style "osso-clock-digital-display-number-0"
-
-style "osso-clock-digital-display-number-1" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_display_number_1.png"
-}
-widget "osso-clock-widget-digit-1" style "osso-clock-digital-display-number-1"
-
-style "osso-clock-digital-display-number-2" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_display_number_2.png"
-}
-widget "osso-clock-widget-digit-2" style "osso-clock-digital-display-number-2"
-
-style "osso-clock-digital-display-number-3" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_display_number_3.png"
-}
-widget "osso-clock-widget-digit-3" style "osso-clock-digital-display-number-3"
-
-style "osso-clock-digital-display-number-4" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_display_number_4.png"
-}
-widget "osso-clock-widget-digit-4" style "osso-clock-digital-display-number-4"
-
-style "osso-clock-digital-display-number-5" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_display_number_5.png"
-}
-widget "osso-clock-widget-digit-5" style "osso-clock-digital-display-number-5"
-
-style "osso-clock-digital-display-number-6" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_display_number_6.png"
-}
-widget "osso-clock-widget-digit-6" style "osso-clock-digital-display-number-6"
-
-style "osso-clock-digital-display-number-7" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_display_number_7.png"
-}
-widget "osso-clock-widget-digit-7" style "osso-clock-digital-display-number-7"
-
-style "osso-clock-digital-display-number-8" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_display_number_8.png"
-}
-widget "osso-clock-widget-digit-8" style "osso-clock-digital-display-number-8"
-
-style "osso-clock-digital-display-number-9" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_display_number_9.png"
-}
-widget "osso-clock-widget-digit-9" style "osso-clock-digital-display-number-9"
-
-style "osso-clock-digital-background" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_background.png"
-}
-widget "osso-clock-widget-clockbg-digital" style "osso-clock-digital-background"
-
-style "osso-clock-digital-display-separator" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_display_separator.png"
-}
-widget "osso-clock-widget-digit-separator" style "osso-clock-digital-display-separator"
-
-style "osso-clock-digital-label-am" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_label_am.png"
-}
-widget "osso-clock-widget-digit-am" style "osso-clock-digital-label-am"
-
-style "osso-clock-digital-label-pm" {
-    bg_pixmap[NORMAL] = "../images/qgn_plat_clock_digital_label_pm.png"
-}
-widget "osso-clock-widget-digit-pm" style "osso-clock-digital-label-pm"
-

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/ossoclock.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/ossoclock)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/ossoglobalsearch
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/ossoglobalsearch	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/ossoglobalsearch	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,38 +0,0 @@
-####################################################
-# OSSO Global search theming
-#
-# Copyright 2006 Nokia Oyj
-#
-#
-####################################################
-
-
-style "osso-hitentry" = "osso-logical-colors" 
-{ 
-  engine "sapwood" 
-  { 
-    image 
-    { 
-      function = FLAT_BOX 
-      state = SELECTED 
-      detail = "eventbox" 
-      file = "../images/qgn_plat_focus_selection.png" 
-      border = { 2, 2, 2, 2 } 
-      stretch = TRUE 
-    } 
-
-    image
-    {
-      function = FOCUS
-      detail = "eventbox"
-      file = "../images/qgn_plat_focus_active.png"
-      border = { 2, 2, 2, 2 }
-      stretch = TRUE
-    }
-  } 
-} 
-
-widget_class "*.OgsHitEntry" style "osso-hitentry" 
-widget_class "*.OgsFileEntry" style "osso-hitentry" 
-widget_class "*.OgsBookmarkEntry" style "osso-hitentry" 
-widget_class "*.OgsContactEntry" style "osso-hitentry" 

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/ossoglobalsearch.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/ossoglobalsearch)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/ossointernetsearchapplet
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/ossointernetsearchapplet	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/ossointernetsearchapplet	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,37 +0,0 @@
-####################################################  
-# OSSO RSS FEED READER
-#
-# Copyright 2005 Nokia Oyj
-#
-####################################################
-style "osso-internetsearch-applet"
-{
-  engine "sapwood"
-    {
-      image
-        {
-          function = BOX
-          file     = "../images/qgn_plat_home_search_bg.png"
-          border   = { 20, 20, 20, 20 }
-          stretch  = TRUE
-        }
-    }
-}
-class "MisWidget" style "osso-internetsearch-applet"
-
-style "osso-internetsearch-applet-button"
-{
-  engine "sapwood"
-    {
-      image
-        {
-          function = BOX
-        }
-      image
-        {
-          function = FOCUS
-        }
-    }
-}
-
-widget_class "*.MisWidget.GtkButton" style "osso-internetsearch-applet-button"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/ossointernetsearchapplet.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/ossointernetsearchapplet)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/ossoiradioapplet
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/ossoiradioapplet	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/ossoiradioapplet	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,95 +0,0 @@
-####################################################  
-# OSSO INTERNET RADIO APPLET
-#
-# Copyright 2005 Nokia Oyj
-#
-####################################################
-style "osso-iradio-applet"
-{
-  GtkFrame::hildonlike = 1
-  xthickness = 0
-  ythickness = 0
-
-  engine "sapwood"
-    {
-      image
-        {
-          function = BOX
-          file     = "../images/qgn_plat_radio_applet_bg.png"
-          border   = { 30, 140, 0, 0 }
-          stretch  = TRUE
-          shaped = TRUE
-        }
-    }
-}
-widget "*.osso-iradio-applet" style "osso-iradio-applet"
-
-style "osso-iradio-applet-volumebar"
-{
-  GtkFrame::hildonlike = 1
-  xthickness = 0
-  ythickness = 0
-
-  engine "sapwood"
-    {
-      image
-        {
-          function = BOX
-          file     = "../images/qgn_plat_radio_applet_volume_bg.png"
-          border   = { 10, 10, 10, 10 }
-          stretch  = TRUE
-          shaped = TRUE
-        }
-    }
-}
-widget "*.osso-iradio-applet.*HildonVolumebar" style "osso-iradio-applet-volumebar"
-
-
-
-style "osso-iradio-volumebar"
-{
-  GtkWindow::hildonlike = 1
-  xthickness = 0
-  ythickness = 0
-
-  engine "sapwood"
-    {
-      image
-        {
-          function = FLAT_BOX
-          file     = "../images/qgn_plat_radio_applet_volume_bg.png"
-          border   = { 10, 10, 10, 10 }
-          stretch  = TRUE
-          shaped = TRUE
-        }
-    }
-}
-widget "osso-iradio-volumebar-window" style "osso-iradio-volumebar"
-
-
-style "osso-iradio-button"
-{
-  GtkButton::hildonlike = 1
-  GtkButton::default_border = { 0, 0, 0, 0 }
-  GtkButton::default_outside_border = { 0, 0, 0, 0 }
-  GtkButton::child_spacing = 0
-  xthickness = 0
-  ythickness = 0
-
-
-  engine "sapwood" {
-    image {
-      function = BOX
-      state = ACTIVE
-    }
-    image {
-      function = FOCUS
-      detail   = "buttondefault"
-    }
-    image {
-      function = BOX
-    }
-  }
-
-}
-widget "*.osso-iradio-button" style "osso-iradio-button"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/ossoiradioapplet.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/ossoiradioapplet)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/ossomediaplayer
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/ossomediaplayer	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/ossomediaplayer	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,192 +0,0 @@
-####################################################
-# OSSO Media player theming
-#
-# Copyright 2006 Nokia Oyj
-#
-#
-####################################################
-
-style "osso-mplayer1-button"
-{
-  engine "sapwood"
-    {
-        image {
-            function = FOCUS
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_mplayer1_pressed_focused.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = FOCUS
-                file     = "../images/qgn_plat_button_mplayer1_focused.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_mplayer1_pressed.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                state    = INSENSITIVE
-                file     = "../images/qgn_plat_button_mplayer1_disabled.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                file     = "../images/qgn_plat_button_mplayer1_normal.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-    }
-}
-
-widget "*.Mplayer1Button" style "osso-mplayer1-button"
-
-style "osso-mplayer2-button"
-{
-  engine "sapwood"
-    {
-        image {
-            function = FOCUS
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_mplayer2_pressed_focused.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = FOCUS
-                file     = "../images/qgn_plat_button_mplayer2_focused.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_mplayer2_pressed.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                state    = INSENSITIVE
-                file     = "../images/qgn_plat_button_mplayer2_disabled.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                file     = "../images/qgn_plat_button_mplayer2_normal.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-    }
-}
-
-widget "*.Mplayer2Button" style "osso-mplayer2-button"
-
-style "osso-mplayer3-button"
-{
-  engine "sapwood"
-    {
-        image {
-            function = FOCUS
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_mplayer3_pressed_focused.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = FOCUS
-                file     = "../images/qgn_plat_button_mplayer3_focused.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_mplayer3_pressed.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                state    = INSENSITIVE
-                file     = "../images/qgn_plat_button_mplayer3_disabled.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                file     = "../images/qgn_plat_button_mplayer3_normal.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-    }
-}
-
-widget "*.Mplayer3Button" style "osso-mplayer3-button"
-
-style "osso-mplayer4-button"
-{
-  engine "sapwood"
-    {
-        image {
-            function = FOCUS
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_mplayer4_pressed_focused.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = FOCUS
-                file     = "../images/qgn_plat_button_mplayer4_focused.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_mplayer4_pressed.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                state    = INSENSITIVE
-                file     = "../images/qgn_plat_button_mplayer4_disabled.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                file     = "../images/qgn_plat_button_mplayer4_normal.png"
-                border   = { 35, 35, 35, 35 }
-                stretch  = TRUE
-        }
-    }
-}
-
-widget "*.Mplayer4Button" style "osso-mplayer4-button"
-
-style "osso-mp-button-frame"
-{
-  GtkFrame::hildonlike = 1
-  engine "sapwood"
-    {
-        image {
-            function = BOX
-                file     = "../images/qgn_plat_mediaplayer_buttons_bg.png"
-                border   = { 0, 0, 112, 112 }
-                stretch  = TRUE
-        }
-    }
-}
-
-widget "*.MplayerButtonFrame" style "osso-mp-button-frame"
-

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/ossomediaplayer.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/ossomediaplayer)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/ossorssfeedreader
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/ossorssfeedreader	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/ossorssfeedreader	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,25 +0,0 @@
-####################################################  
-# OSSO RSS FEED READER
-#
-# Copyright 2005 Nokia Oyj
-#
-####################################################
-style "osso-rss-feed-reader"
-{
-  GtkFrame::hildonlike = 1
-  xthickness = 0
-  ythickness = 0
-
-  engine "sapwood"
-    {
-      image
-        {
-          function = BOX
-          file     = "../images/qgn_plat_news_applet_bg.png"
-          border   = { 55, 55, 55, 15 }
-          stretch  = TRUE
-          shaped = TRUE
-        }
-    }
-}
-widget "*.osso-rss-feed-reader" style "osso-rss-feed-reader"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/ossorssfeedreader.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/ossorssfeedreader)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/ossortc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/ossortc	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/ossortc	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,93 +0,0 @@
-####################################################
-# OSSO Real Time Communication theming
-#
-# Copyright 2006 Nokia Oyj
-#
-#
-####################################################
-
-
-style "osso-rtc-window"
-{
-    engine "sapwood"
-    {
-        image {
-            function = FLAT_BOX
-                file     = "../images/qgn_plat_application_chat_background.jpg"
-                stretch  = TRUE
-        }
-    }
-}
-widget "*.ChavoWindow" style "osso-rtc-window"
-
-
-style "osso-rtc-button"
-{
-  engine "sapwood"
-    {
-        image {
-            function = FOCUS
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_voip_pressed.png"
-                border   = { 38, 38, 0, 0 }
-                stretch  = TRUE
-        }
-        image {
-            function = FOCUS
-                file     = "../images/qgn_plat_button_voip_focused.png"
-                border   = { 38, 38, 0, 0 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_voip_pressed.png"
-                border   = { 38, 38, 0, 0 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                state    = INSENSITIVE
-                file     = "../images/qgn_plat_button_voip_disabled.png"
-                border   = { 38, 38, 0, 0 }
-                stretch  = TRUE
-        }
-        image {
-            function = BOX
-                file     = "../images/qgn_plat_button_voip_normal.png"
-                border   = { 38, 38, 0, 0 }
-                stretch  = TRUE
-        }
-    }
-}
-
-
-widget "*.ChavoButton" style "osso-rtc-button"
-
-style "osso-rtc-frame"
-{
-  GtkFrame::hildonlike = 1
-  engine "sapwood"
-    {
-        image {
-            function = BOX
-                file     = "../images/qgn_plat_application_call_handling_frame_block.png"
-                border   = { 12, 12, 12, 12 }
-                stretch  = TRUE
-        }
-    }
-}
-widget "*.ChavoFrame" style "osso-rtc-frame"
-
-
-style "osso-ChavoSystemFont" {
-    font_name = "Nokia Sans 22.11"
-}
-widget "*.ChavoLabel" style "osso-ChavoSystemFont"
-
-
-style "osso-ChavoButtonFont" {
-    font_name = "Nokia Sans 30.15"
-}
-widget "*.ChavoButton.GtkLabel" style "osso-ChavoButtonFont"
-

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/ossortc.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/ossortc)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/ossospeeddial
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/ossospeeddial	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/ossospeeddial	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,25 +0,0 @@
-####################################################  
-# OSSO SPEED DIAL APPLET
-#
-# Copyright 2005 Nokia Oyj
-#
-####################################################
-style "osso-speeddial"
-{
-  GtkFrame::hildonlike = 1
-  xthickness = 0
-  ythickness = 0
-
-  engine "sapwood"
-    {
-      image
-        {
-          function = BOX
-          file     = "../images/qgn_plat_gene_applet_bg.png"
-          border   = { 25, 25, 25, 25 }
-          stretch  = TRUE
-          shaped   = TRUE
-        }
-    }
-}
-widget "*.osso-speeddial" style "osso-speeddial"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/ossospeeddial.rc (from rev 8334, projects/haf/trunk/hildon-theme-layout-3/rc/ossospeeddial)

Deleted: projects/haf/trunk/hildon-theme-layout-3/rc/themespecificgtk
===================================================================
--- projects/haf/trunk/hildon-theme-layout-3/rc/themespecificgtk	2006-11-30 10:36:38 UTC (rev 8493)
+++ projects/haf/trunk/hildon-theme-layout-3/rc/themespecificgtk	2006-11-30 12:16:20 UTC (rev 8494)
@@ -1,170 +0,0 @@
-# theme specific stuff here. Included by gtkrc.
-
-##############################
-#
-# Logical color definitions
-#
-##############################
-
-style "osso-logical-colors" {
-	logical_color["DefaultTextColor"]        = "@DefaultTextColor@"
-	logical_color["EmpTextColor"]            = "@EmpTextColor@"
-	logical_color["PaintedDefaultTextColor"] = "@PaintedDefaultTextColor@"
-	logical_color["DisabledTextColor"]       = "@DisabledTextColor@"
-	logical_color["ProgressTextColor1"]      = "@ProgressTextColor1@"
-	logical_color["ProgressTextColor2"]      = "@ProgressTextColor2@"
-	logical_color["SecondaryTextColor"]      = "@SecondaryTextColor@"
-	logical_color["TitleTextColor"]          = "@TitleTextColor@"
-	logical_color["DialogTitleTextColor"]    = "@DialogTitleTextColor@"
-	
-	logical_color["ClearButtonTextColor"]    = "@ClearButtonTextColor@"
-	logical_color["MemButtonTextColor"]      = "@MemButtonTextColor@"
-	
-	logical_color["HWRAlphaTextColor"]       = "@HWRAlphaTextColor@"
-	logical_color["HWRNumberTextColor"]      = "@HWRNumberTextColor@"
-	logical_color["HWRDimmedTextColor"]      = "@HWRDimmedTextColor@"
-	logical_color["HWRIllegalTextColor"]     = "@HWRIllegalTextColor@"
-	
-	logical_color["WebTextColor"]            = "@WebTextColor@"
-	logical_color["DimWebTextColor"]         = "@DimWebTextColor@"
-	logical_color["LinkTextColor"]           = "@LinkTextColor@"
-	logical_color["VisitedLinkTextColor"]    = "@VisitedLinkTextColor@"
-	
-	logical_color["DefaultBackgrdColor"]     = "@DefaultBackgrdColor@"
-	logical_color["PaintedBackgrdColor"]     = "@PaintedBackgrdColor@"
-	logical_color["ImageBackgrdColor"]       = "@ImageBackgrdColor@"
-	
-	logical_color["InputBackgrdColor"]       = "@InputBackgrdColor@"
-	logical_color["HWRAlphaBackgrdColor"]    = "@HWRAlphaBackgrdColor@"
-	logical_color["HWRPunctBackgrdColor"]    = "@HWRPunctBackgrdColor@"
-	logical_color["HWRContBackgrdColor"]     = "@HWRContBackgrdColor@"
-	logical_color["HWRHyphBackgrdColor"]     = "@HWRHyphBackgrdColor@"
-	
-	logical_color["WebBackgrdColor"]         = "@WebBackgrdColor@"
-	
-	logical_color["ImageBorderColor"]        = "@ImageBorderColor@"
-	logical_color["FocusColor"]              = "@FocusColor@"
-	logical_color["SelectionColor"]          = "@SelectionColor@"
-	
-	logical_color["MapTopLeftColor"]         = "@MapTopLeftColor@"
-	logical_color["MapBottomRightColor"]     = "@MapBottomRightColor@"
-	logical_color["ClockHandColor"]          = "@ClockHandColor@"
-	
-	logical_color["HWRBaselineColor"]        = "@HWRBaselineColor@"
-	logical_color["HWRRecogColor"]           = "@HWRRecogColor@"
-	logical_color["HWRUserColor"]            = "@HWRUserColor@"
-	logical_color["HWRUserBackgrdColor"]     = "@HWRUserBackgrdColor@"
-	logical_color["HWRHintColor"]            = "@HWRHintColor@"
-
-	logical_color["ChatUserNameColor"]       = "@ChatUserNameColor@"
-	logical_color["ChatParticipantNameColor"]= "@ChatParticipantNameColor@"
-	logical_color["ChatEventColor"]          = "@ChatEventColor@"
-	
-	logical_color["CallHeaderBlockBgColor"]  = "@CallHeaderBlockBgColor@"
-	logical_color["CallHeaderOnHoldBlockBgColor"] = "@CallHeaderOnHoldBlockBgColor@"
-	
-	logical_color["HomeFrameNormal"]         = "@HomeFrameNormal@"
-	logical_color["HomeFrameResize"]         = "@HomeFrameResize@"
-	logical_color["HomeFrameReject"]         = "@HomeFrameReject@"
-	
-	logical_color["MenuInfoTextColor"]       = "@MenuInfoTextColor@"
-	logical_color["MenuInfoTextColor"]       = "@MenuInfoTextColor@"
-        logical_color["VKBButtonTextColor"]      = "@VKBButtonTextColor@"
-}
-
-##############################
-#
-# Font definitions
-#
-##############################
-
-style "osso-SystemFont" {
-	font_name = "Nokia Sans 16.75"
-}
-
-style "osso-EmpSystemFont" {
-	font_name = "Nokia Sans Bold 16.75"
-}
-
-style "osso-TitleFont" {
-	font_name = "Nokia Sans 16.75"
-}
-
-style "osso-ButtonFont" {
-	font_name = "Nokia Sans 16.75"
-}
-
-style "osso-SmallFont" {
-	font_name = "Nokia Sans 11.625"
-}
-
-style "osso-LargeFont" {
-	font_name = "Nokia Sans 29.5"
-}
-
-style "osso-HWRFont1"
-{
-  font_name = "Nokia Sans 52"
-}
-
-style "osso-HWRFont2"
-{
-  font_name = "Nokia Sans 38"
-}
-
-######################################
-#
-# Application menu popup position
-#
-# The position of application menu relative to application upper-left 
-# position (horizontal = 80, vertical = 60) so adjust below
-# horizontal-offset and vertical-offset to change it from the application
-# upper-left position. The values can be negative too.
-#
-######################################
-
-style "osso-application-menu-popup-position"
-{
-  GtkMenu::horizontal-offset = 10
-  GtkMenu::vertical-offset = -13
-}
-
-
-
-
-######################################
-#
-# Graphical, pixbuf theme specific stuff
-#
-# All style properties that should only be
-# used in a pixbuf-themed theme can be
-# added somewhere here.
-#
-######################################
-
-# The below style property will make GtkEntry use gtk_paint_box instead
-# of gtk_paint_shadow. In non-graphical themes this should be set to 0.
-style "osso-entry-special"
-{
-  GtkEntry::hildonlike-drawing = 1
-}
-
-
-
-
-
-##############################
-#
-# WARNING : DEPRECATED
-#
-# Zoomed font sizes
-#
-# All of these now use the exactly same font & size
-#
-# WARNING : DEPRECATED
-#
-##############################
-
-widget "hildon-zoom-small" style "osso-SystemFont"
-widget "hildon-zoom-medium" style "osso-SystemFont"
-widget "hildon-zoom-large" style "osso-SystemFont"

Copied: projects/haf/trunk/hildon-theme-layout-3/rc/themespecificgtk.rc (from rev 8349, projects/haf/trunk/hildon-theme-layout-3/rc/themespecificgtk)


More information about the maemo-commits mailing list