[maemo-commits] [maemo-commits] r8255 - in projects/haf/trunk/maemo-theme-layout-3: . rc
From: mdk at stage.maemo.org mdk at stage.maemo.orgDate: Wed Nov 22 15:09:38 EET 2006
- Previous message: [maemo-commits] r8254 - in projects/haf/trunk/maemo-theme-tools: . scripts src
- Next message: [maemo-commits] r8256 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: mdk Date: 2006-11-22 15:09:35 +0200 (Wed, 22 Nov 2006) New Revision: 8255 Added: projects/haf/trunk/maemo-theme-layout-3/rc/ossomediaplayer Modified: projects/haf/trunk/maemo-theme-layout-3/ChangeLog projects/haf/trunk/maemo-theme-layout-3/rc/Makefile.am projects/haf/trunk/maemo-theme-layout-3/rc/defaultarrows projects/haf/trunk/maemo-theme-layout-3/rc/gtkcalendar projects/haf/trunk/maemo-theme-layout-3/rc/gtkexpander projects/haf/trunk/maemo-theme-layout-3/rc/gtkmenu projects/haf/trunk/maemo-theme-layout-3/rc/gtknotebook projects/haf/trunk/maemo-theme-layout-3/rc/gtkrc projects/haf/trunk/maemo-theme-layout-3/rc/gtkseparator projects/haf/trunk/maemo-theme-layout-3/rc/gtktreeview projects/haf/trunk/maemo-theme-layout-3/rc/hildondateeditor projects/haf/trunk/maemo-theme-layout-3/rc/hildonkeyboard projects/haf/trunk/maemo-theme-layout-3/rc/hildonnavigator projects/haf/trunk/maemo-theme-layout-3/rc/hildonstatusbar projects/haf/trunk/maemo-theme-layout-3/rc/hildontimeeditor projects/haf/trunk/maemo-theme-layout-3/rc/ossoglobalsearch projects/haf/trunk/maemo-theme-layout-3/rc/ossortc Log: 2006-11-22 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> * rc/Makefile.am: Adding the mediaplayer styles. * rc/defaultarrows: * rc/gtkcalendar: * rc/gtkexpander: * rc/gtkmenu: * rc/gtknotebook: * rc/gtkrc: * rc/gtkseparator: * rc/gtktreeview: * rc/hildondateeditor: * rc/hildonkeyboard: * rc/hildonnavigator: * rc/hildonstatusbar: * rc/hildontimeeditor: * rc/ossoglobalsearch: * rc/ossomediaplayer: * rc/ossortc: Updating to bleeding edge. Modified: projects/haf/trunk/maemo-theme-layout-3/ChangeLog =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/ChangeLog 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/ChangeLog 2006-11-22 13:09:35 UTC (rev 8255) @@ -1,3 +1,24 @@ +2006-11-22 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> + + * rc/Makefile.am: Adding the mediaplayer styles. + + * rc/defaultarrows: + * rc/gtkcalendar: + * rc/gtkexpander: + * rc/gtkmenu: + * rc/gtknotebook: + * rc/gtkrc: + * rc/gtkseparator: + * rc/gtktreeview: + * rc/hildondateeditor: + * rc/hildonkeyboard: + * rc/hildonnavigator: + * rc/hildonstatusbar: + * rc/hildontimeeditor: + * rc/ossoglobalsearch: + * rc/ossomediaplayer: + * rc/ossortc: Updating to bleeding edge. + 2006-11-21 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> * Makefile.am: Modified: projects/haf/trunk/maemo-theme-layout-3/rc/Makefile.am =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/Makefile.am 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/Makefile.am 2006-11-22 13:09:35 UTC (rev 8255) @@ -59,6 +59,7 @@ ossoapplicationinstaller \ ossoclock \ ossoglobalsearch \ + ossomediaplayer \ ossointernetsearchapplet \ ossoiradioapplet \ ossorssfeedreader \ Modified: projects/haf/trunk/maemo-theme-layout-3/rc/defaultarrows =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/defaultarrows 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/defaultarrows 2006-11-22 13:09:35 UTC (rev 8255) @@ -12,7 +12,7 @@ arrow_direction = LEFT overlay_file = "../images/qgn_plat_arrow_left_pressed.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -21,7 +21,7 @@ arrow_direction = LEFT overlay_file = "../images/qgn_plat_arrow_left_pressed.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -30,7 +30,7 @@ arrow_direction = LEFT overlay_file = "../images/qgn_plat_arrow_left_disabled.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -38,7 +38,7 @@ arrow_direction = LEFT overlay_file = "../images/qgn_plat_arrow_left_normal.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } # right @@ -49,7 +49,7 @@ arrow_direction = RIGHT overlay_file = "../images/qgn_plat_arrow_right_pressed.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -58,7 +58,7 @@ arrow_direction = RIGHT overlay_file = "../images/qgn_plat_arrow_right_pressed.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -67,7 +67,7 @@ arrow_direction = RIGHT overlay_file = "../images/qgn_plat_arrow_right_disabled.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -75,7 +75,7 @@ arrow_direction = RIGHT overlay_file = "../images/qgn_plat_arrow_right_normal.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } # up @@ -86,7 +86,7 @@ arrow_direction = UP overlay_file = "../images/qgn_plat_arrow_up_pressed.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -95,7 +95,7 @@ arrow_direction = UP overlay_file = "../images/qgn_plat_arrow_up_pressed.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -104,7 +104,7 @@ arrow_direction = UP overlay_file = "../images/qgn_plat_arrow_up_disabled.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -112,7 +112,7 @@ arrow_direction = UP overlay_file = "../images/qgn_plat_arrow_up_normal.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } # down @@ -123,7 +123,7 @@ arrow_direction = DOWN overlay_file = "../images/qgn_plat_arrow_down_pressed.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -132,7 +132,7 @@ arrow_direction = DOWN overlay_file = "../images/qgn_plat_arrow_down_pressed.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -141,7 +141,7 @@ arrow_direction = DOWN overlay_file = "../images/qgn_plat_arrow_down_disabled.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -149,7 +149,7 @@ arrow_direction = DOWN overlay_file = "../images/qgn_plat_arrow_down_normal.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } } } Modified: projects/haf/trunk/maemo-theme-layout-3/rc/gtkcalendar =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/gtkcalendar 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/gtkcalendar 2006-11-22 13:09:35 UTC (rev 8255) @@ -11,6 +11,8 @@ 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" Modified: projects/haf/trunk/maemo-theme-layout-3/rc/gtkexpander =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/gtkexpander 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/gtkexpander 2006-11-22 13:09:35 UTC (rev 8255) @@ -23,7 +23,7 @@ arrow_direction = RIGHT overlay_file = "../images/qgn_plat_arrow_expander_focused.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { function = ARROW @@ -32,7 +32,7 @@ arrow_direction = DOWN overlay_file = "../images/qgn_plat_arrow_expander_down_focused.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { function = ARROW @@ -41,7 +41,7 @@ arrow_direction = RIGHT overlay_file = "../images/qgn_plat_arrow_expander_normal.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { function = ARROW @@ -50,7 +50,7 @@ arrow_direction = DOWN overlay_file = "../images/qgn_plat_arrow_expander_down_normal.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { function = ARROW @@ -59,7 +59,7 @@ arrow_direction = RIGHT overlay_file = "../images/qgn_plat_arrow_expander_disabled.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { function = ARROW @@ -68,7 +68,7 @@ arrow_direction = DOWN overlay_file = "../images/qgn_plat_arrow_expander_down_disabled.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } } Modified: projects/haf/trunk/maemo-theme-layout-3/rc/gtkmenu =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/gtkmenu 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/gtkmenu 2006-11-22 13:09:35 UTC (rev 8255) @@ -37,6 +37,7 @@ image { function = BOX state = NORMAL + detail = "menu" file = "../images/qgn_plat_application_menu_lower_level_frame.png" border = { 20, 20, 20, 20 } stretch = TRUE @@ -100,6 +101,7 @@ image { function = BOX state = NORMAL + detail = "menu" file = "../images/qgn_plat_application_menu_1st_level_frame.png" border = { 20, 20, 20, 20 } stretch = TRUE @@ -117,6 +119,7 @@ image { function = BOX state = NORMAL + detail = "menu" file = "../images/qgn_plat_application_menu_lower_level_frame.png" border = { 20, 20, 20, 20 } stretch = TRUE @@ -134,14 +137,86 @@ 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" @@ -149,4 +224,8 @@ 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" Modified: projects/haf/trunk/maemo-theme-layout-3/rc/gtknotebook =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/gtknotebook 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/gtknotebook 2006-11-22 13:09:35 UTC (rev 8255) @@ -71,7 +71,7 @@ arrow_direction = LEFT overlay_file = "../images/qgn_plat_notebook_button_previous_disabled.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -80,7 +80,7 @@ arrow_direction = LEFT overlay_file = "../images/qgn_plat_notebook_button_previous_pressed.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -89,7 +89,7 @@ arrow_direction = LEFT overlay_file = "../images/qgn_plat_notebook_button_previous.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } # Arrows right @@ -100,7 +100,7 @@ arrow_direction = RIGHT overlay_file = "../images/qgn_plat_notebook_button_next_disabled.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -109,7 +109,7 @@ arrow_direction = RIGHT overlay_file = "../images/qgn_plat_notebook_button_next_pressed.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } image { @@ -118,7 +118,7 @@ arrow_direction = RIGHT overlay_file = "../images/qgn_plat_notebook_button_next.png" overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE + overlay_stretch = FALSE } } } Modified: projects/haf/trunk/maemo-theme-layout-3/rc/gtkrc =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/gtkrc 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/gtkrc 2006-11-22 13:09:35 UTC (rev 8255) @@ -61,6 +61,9 @@ # (and truncating) in dialogs. # GtkLabel::hildonlike = 1 + GtkWidget::scroll-arrow-hlength = 20 + GtkWidget::scroll-arrow-vlength = 20 + GtkToggleButton::hildonlike = 1 GtkCalendar::hildonlike = 1 @@ -219,6 +222,7 @@ include "ossortc" include "ossoglobalsearch" include "ossoapplicationinstaller" +include "ossomediaplayer" # Maemo af desktop widgets included in gtkrc.maemo_af_desktop #include "hildonhome" Modified: projects/haf/trunk/maemo-theme-layout-3/rc/gtkseparator =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/gtkseparator 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/gtkseparator 2006-11-22 13:09:35 UTC (rev 8255) @@ -9,7 +9,7 @@ style "osso-separator" { - GtkSeparator::hildonlike = 1 + GtkSeparator::hildonlike-drawing = 1 ythickness = 3 xthickness = 3 @@ -20,7 +20,7 @@ function = BOX detail = "hseparator" file = "../images/qgn_plat_separator_horizontal.png" - border = { 5, 5, 0, 0 } + border = { 12, 12, 0, 0 } stretch = TRUE } image @@ -28,7 +28,7 @@ function = BOX detail = "vseparator" file = "../images/qgn_plat_separator_vertical.png" - border = { 0, 0, 5, 5 } + border = { 0, 0, 12, 12 } stretch = TRUE } } Modified: projects/haf/trunk/maemo-theme-layout-3/rc/gtktreeview =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/gtktreeview 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/gtktreeview 2006-11-22 13:09:35 UTC (rev 8255) @@ -15,6 +15,7 @@ GtkTreeView::vertical-separator = 2 GtkTreeView::hildonlike = 1 GtkTreeView::passive_focus = 1 + GtkTreeView::separator-height = 15 engine "sapwood" { Modified: projects/haf/trunk/maemo-theme-layout-3/rc/hildondateeditor =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/hildondateeditor 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/hildondateeditor 2006-11-22 13:09:35 UTC (rev 8255) @@ -33,3 +33,35 @@ 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" Modified: projects/haf/trunk/maemo-theme-layout-3/rc/hildonkeyboard =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/hildonkeyboard 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/hildonkeyboard 2006-11-22 13:09:35 UTC (rev 8255) @@ -63,8 +63,12 @@ #common control buttons -style "osso-input-method-side-button" +style "osso-input-method-side-button" = "osso-logical-colors" { + fg[NORMAL] = "VKBButtonTextColor" + fg[ACTIVE] = "VKBButtonTextColor" + fg[PRELIGHT] = "VKBButtonTextColor" + engine "sapwood" { image @@ -120,10 +124,15 @@ } } 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" +style "osso-input-method-side-toggle-button" = "osso-logical-colors" { + fg[NORMAL] = "VKBButtonTextColor" + fg[ACTIVE] = "VKBButtonTextColor" + fg[PRELIGHT] = "VKBButtonTextColor" + engine "sapwood" { image @@ -160,10 +169,13 @@ } } 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" +style "osso-input-method-vkb-key" = "osso-logical-colors" { + fg[NORMAL] = "VKBButtonTextColor" + GtkButton::child_spacing = 0 engine "sapwood" { @@ -210,8 +222,10 @@ widget "*.osso-im-dim" style "osso-input-method-vkb-key" #accent dead keys in vkb -style "osso-input-method-accent-key" +style "osso-input-method-accent-key" = "osso-logical-colors" { + fg[NORMAL] = "VKBButtonTextColor" + engine "sapwood" { image @@ -262,45 +276,107 @@ #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 = BOX - state = NORMAL + 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 = BOX - state = PRELIGHT - shadow = IN + function = EXTENSION file = "../images/qgn_plat_inputmet_tab_special_character_selected.png" - border = { 5, 5, 0, 0 } - stretch = TRUE + border = { 5, 5, 0, 0 } + stretch = TRUE + gap_side = BOTTOM } + # Content area theming when arrows are not present. image { - function = BOX - state = PRELIGHT - shadow = OUT - file = "../images/qgn_plat_inputmet_tab_special_character_normal.png" - border = { 5, 5, 0, 0 } - stretch = TRUE + function = BOX_GAP + detail = "notebook" } + # Content area theming when arrows are present. image { - function = BOX - state = ACTIVE - file = "../images/qgn_plat_inputmet_tab_special_character_selected.png" - border = { 5, 5, 0, 0 } - stretch = TRUE + 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 @@ -479,8 +555,10 @@ widget "*.osso-im-fkb-common-button" style "osso-input-method-fkb-common-button" #finger keyboard input keys -style "osso-input-method-fkb-key" +style "osso-input-method-fkb-key" = "osso-logical-colors" { + fg[NORMAL] = "VKBButtonTextColor" + GtkButton::child_spacing = 0 engine "sapwood" { @@ -579,8 +657,10 @@ 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" +style "osso-input-method-fkb-accent-key" = "osso-logical-colors" { + fg[NORMAL] = "VKBButtonTextColor" + engine "sapwood" { image Modified: projects/haf/trunk/maemo-theme-layout-3/rc/hildonnavigator =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/hildonnavigator 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/hildonnavigator 2006-11-22 13:09:35 UTC (rev 8255) @@ -10,7 +10,7 @@ { function = FLAT_BOX state = NORMAL - file = "../images/qgn_plat_task_navigation_menu_frame.png" + file = "../images/qgn_plat_tool_tip.png" border = { 20, 20, 20, 20 } stretch = TRUE } @@ -64,6 +64,12 @@ 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" @@ -109,6 +115,12 @@ 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" @@ -154,6 +166,12 @@ 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" @@ -200,6 +218,12 @@ 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 + } } } @@ -217,6 +241,12 @@ 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 + } } } @@ -234,6 +264,12 @@ 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 + } } } @@ -251,6 +287,12 @@ 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 + } } } @@ -297,7 +339,12 @@ 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 + } } } @@ -318,6 +365,13 @@ 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 + } } } @@ -335,6 +389,13 @@ 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 + } } } @@ -352,6 +413,13 @@ 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 + } } } @@ -369,6 +437,13 @@ 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 + } } } Modified: projects/haf/trunk/maemo-theme-layout-3/rc/hildonstatusbar =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/hildonstatusbar 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/hildonstatusbar 2006-11-22 13:09:35 UTC (rev 8255) @@ -7,6 +7,21 @@ } 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 } Modified: projects/haf/trunk/maemo-theme-layout-3/rc/hildontimeeditor =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/hildontimeeditor 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/hildontimeeditor 2006-11-22 13:09:35 UTC (rev 8255) @@ -28,27 +28,24 @@ style "osso-time-editor-ampm-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 = 1 - GtkWidget::focus-padding = 0 - GtkWidget::focus-line-width = 0 - GtkButton::child_spacing = 0 - xthickness = 0 - ythickness = 0 + xthickness = 1 + ythickness = 1 engine "sapwood" { - image - { - function = BOX - border = { 0, 0, 0, 0} - stretch = TRUE - } + 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" Modified: projects/haf/trunk/maemo-theme-layout-3/rc/ossoglobalsearch =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/ossoglobalsearch 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/ossoglobalsearch 2006-11-22 13:09:35 UTC (rev 8255) @@ -20,9 +20,19 @@ 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 "*.OgsBookmarkEntry*" style "osso-hitentry" -widget_class "*.OgsContactEntry*" style "osso-hitentry" +widget_class "*.OgsHitEntry" style "osso-hitentry" +widget_class "*.OgsFileEntry" style "osso-hitentry" +widget_class "*.OgsBookmarkEntry" style "osso-hitentry" +widget_class "*.OgsContactEntry" style "osso-hitentry" Added: projects/haf/trunk/maemo-theme-layout-3/rc/ossomediaplayer =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/ossomediaplayer 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/ossomediaplayer 2006-11-22 13:09:35 UTC (rev 8255) @@ -0,0 +1,192 @@ +#################################################### +# 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" + Modified: projects/haf/trunk/maemo-theme-layout-3/rc/ossortc =================================================================== --- projects/haf/trunk/maemo-theme-layout-3/rc/ossortc 2006-11-22 13:04:01 UTC (rev 8254) +++ projects/haf/trunk/maemo-theme-layout-3/rc/ossortc 2006-11-22 13:09:35 UTC (rev 8255) @@ -13,7 +13,7 @@ { image { function = FLAT_BOX - file = "../images/qgn_plat_application_voip_background.png" + file = "../images/qgn_plat_application_chat_background.jpg" stretch = TRUE } }
- Previous message: [maemo-commits] r8254 - in projects/haf/trunk/maemo-theme-tools: . scripts src
- Next message: [maemo-commits] r8256 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]