Sorry for that. I thought it built against ARM before I submitted. I'll work with Mirek to fix.
-Kaitlin -----Original Message----- From: Zhu, Peter J Sent: Tuesday, November 02, 2010 6:30 PM To: [email protected]; Rupert, Kaitlin Subject: RE: [meego-commits] 9152: Changes to Trunk:Testing/meegotouch-theme This and libmeegotouch build failed for ARM. Peter > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Kaitlin Rupert > Sent: Tuesday, November 02, 2010 10:55 PM > To: [email protected] > Subject: [meego-commits] 9152: Changes to Trunk:Testing/meegotouch-theme > > Hi, > I have made the following changes to meegotouch-theme in project > Trunk:Testing. Please review and accept ASAP. > > Thank You, > Kaitlin Rupert > > [This message was auto-generated] > > --- > > Request #9152: > > submit: devel:qt-mtf/meegotouch-theme(r36) -> > Trunk:Testing/meegotouch-theme > > > Message: > * Mon Nov 01 2010 Miroslav Safr <[email protected]> > 0.20.51-1 > - updated to release 0.20.51-1 > > State: new 2010-11-02T07:55:23 krupert > Comment: None > > > > changes files: > -------------- > --- meegotouch-theme.changes > +++ meegotouch-theme.changes > @@ -0,0 +1,3 @@ > +* Mon Nov 01 2010 Miroslav Safr <[email protected]> 0.20.51-1 > +- updated to release 0.20.51-1 > + > > old: > ---- > meegotouch-theme-0.20.50.tar.bz2 > > new: > ---- > meegotouch-theme-0.20.51.tar.bz2 > > spec files: > ----------- > --- meegotouch-theme.spec > +++ meegotouch-theme.spec > @@ -7,7 +7,7 @@ > > Name: meegotouch-theme > Summary: Theme for Meego Touch based applications > -Version: 0.20.50 > +Version: 0.20.51 > Release: 1 > Group: System/Desktop > License: LGPLv2.1 > > other changes: > -------------- > > ++++++ meegotouch-theme-0.20.50.tar.bz2 -> > meegotouch-theme-0.20.51.tar.bz2 > --- > base/meegotouch/libmeegotouchviews/style/commonlayouts/commonbuttons > tyle.css > +++ > base/meegotouch/libmeegotouchviews/style/commonlayouts/commonbuttons > tyle.css > @@ -1,6 +1,4 @@ > -/* CB reffers to CommonButton */ > -/* CSB reffers to CommonSplitButton */ > -...@const CB_WIDTH: 32.2mm; > +...@const CB_WIDTH: 32.2mm; /* CB reffers to CommonButton */ > @const CB_HEIGHT: 5.1mm; > @const CB_M_TOP: 1.5mm; > @const CB_M_BOTTOM: 1.5mm; > @@ -19,7 +17,7 @@ > @const CB_SPACE_LEFT: 0.3mm; > @const CB_SPACE_TOP: 0.3mm; > @const CB_SPACE_BOTTOM: 0.2mm; > -...@const CSB_SPACE_RIGHT: 0; > +...@const CSB_SPACE_RIGHT: 0; /* CSB reffers to CommonSplitButton */ > @const CSB_SPACE_LEFT: 0; > @const CSB_SPACE_TOP: 0; > @const CSB_SPACE_BOTTOM: 0; > @@ -32,6 +30,18 @@ > @const CB_BG_NEGATIVE: > meegotouch-button-negative-background; > @const CB_BG_NEGATIVE_PRESSED: > meegotouch-button-negative-background-pressed; > @const CB_BG_NEGATIVE_SELECTED: > meegotouch-button-negative-background-selected; > +...@const CB_BG_POSITIVE_INVERTED: > meegotouch-button-positive-inverted-background; > +...@const CB_BG_POSITIVE_INVERTED_PRESSED: > meegotouch-button-positive-inverted-background-pressed; > +...@const CB_BG_POSITIVE_INVERTED_SELECTED: > meegotouch-button-positive-inverted-background-selected; > +...@const CB_BG_NEGATIVE_INVERTED: > meegotouch-button-negative-inverted-background; > +...@const CB_BG_NEGATIVE_INVERTED_PRESSED: > meegotouch-button-negative-inverted-background-pressed; > +...@const CB_BG_NEGATIVE_INVERTED_SELECTED: > meegotouch-button-negative-inverted-background-selected; > +...@const TBB_CORNERS: 20px 20px 20px 20px; /* Toolbar buttons */ > +...@const TBB_WIDTH: 18.6mm; > +...@const TBB_HEIGHT: 4.2mm; > +...@const TBSB_CORNERS: 24px 24px 24px 24px; /* Toolbar split-buttons */ > +...@const TBSB_WIDTH: 18.6mm; > +...@const TBSB_HEIGHT: 5mm; > > /* buttons for default application background color */ > > @@ -123,28 +133,6 @@ > background-image:$CB_BG_INVERTED_SELECTED $CORNER_MARGINS; > text-color: $CB_FONT_COLOR_INVERTED_SELECTED; > } > -/***********/ > -#CommonQueryButton { > -margin-top: $CB_M_TOP; > -margin-bottom: $CB_M_BOTTOM; > -margin-left: 0.3mm; > -margin-right: 0.3mm; > - > -minimum-size: 20.6mm 5.1mm; > -maximum-size:20.6mm 5.1mm; > -preferred-size:20.6mm 5.1mm; > - > -text-color: $CB_FONT_COLOR_INVERTED; > -background-image:$CB_BG_INVERTED $CORNER_MARGINS; > -} > -#CommonQueryButton:pressed { > -background-image:$CB_BG_INVERTED_PRESSED $CORNER_MARGINS; > -text-color: $CB_FONT_COLOR_INVERTED_PRESSED; > -} > -#CommonQueryButton:selected { > -background-image:$CB_BG_INVERTED_SELECTED $CORNER_MARGINS; > -text-color: $CB_FONT_COLOR_INVERTED_SELECTED; > -} > > #CommonLeftButtonInverted { > margin-top: $CB_M_TOP; > @@ -570,6 +558,257 @@ > background-image:$CB_BG_NEGATIVE_SELECTED $CORNER_MARGINS; > } > > +/* positive inverted buttons */ > + > +#CommonSingleButtonPositiveInverted { > +margin-top: $CB_M_TOP; > +margin-bottom: $CB_M_BOTTOM; > +margin-left: $CB_M_LEFT; > +margin-right: $CB_M_RIGHT; > + > +text-color: $CB_FONT_COLOR_POSITIVE; > +background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS; > +} > +#CommonSingleButtonPositiveInverted:pressed { > +background-image:$CB_BG_POSITIVE_INVERTED_PRESSED > $CORNER_MARGINS; > +} > +#CommonSingleButtonPositiveInverted:selected { > +background-image:$CB_BG_POSITIVE_INVERTED_SELECTED > $CORNER_MARGINS; > +} > + > +#CommonLeftButtonPositiveInverted { > +margin-top: $CB_M_TOP; > +margin-bottom: $CB_M_BOTTOM; > +margin-left: $CB_M_LEFT; > +margin-right: $CB_SPACE_RIGHT; > + > +text-color: $CB_FONT_COLOR_POSITIVE; > +background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS; > +} > +#CommonLeftButtonPositiveInverted:pressed { > +background-image:$CB_BG_POSITIVE_INVERTED_PRESSED > $CORNER_MARGINS; > +} > +#CommonLeftButtonPositiveInverted:selected { > +background-image:$CB_BG_POSITIVE_INVERTED_SELECTED > $CORNER_MARGINS; > +} > + > +#CommonHorizontalCenterButtonPositiveInverted { > +margin-top: $CB_M_TOP; > +margin-bottom: $CB_M_BOTTOM; > +margin-left: $CB_SPACE_LEFT; > +margin-right: $CB_SPACE_RIGHT; > + > +text-color: $CB_FONT_COLOR_POSITIVE; > +background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS; > +} > + > +#CommonRightButtonPositiveInverted { > +margin-top: $CB_M_TOP; > +margin-bottom: $CB_M_BOTTOM; > +margin-left: $CB_SPACE_LEFT; > +margin-right: $CB_M_RIGHT; > + > +text-color: $CB_FONT_COLOR_POSITIVE; > +background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS; > +} > +#CommonRightButtonPositiveInverted:pressed { > +background-image:$CB_BG_POSITIVE_INVERTED_PRESSED > $CORNER_MARGINS; > +} > +#CommonRightButtonPositiveInverted:selected { > +background-image:$CB_BG_POSITIVE_INVERTED_SELECTED > $CORNER_MARGINS; > +} > + > +#CommonTopButtonPositiveInverted { > +margin-top: $CB_M_TOP; > +margin-left: $CB_M_LEFT; > +text-color: $CB_FONT_COLOR_POSITIVE; > +background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS; > +} > +#CommonTopButtonPositiveInverted.Portrait { > +margin-bottom: $CB_SPACE_BOTTOM; > +margin-right: $CB_M_RIGHT; > +} > +#CommonTopButtonPositiveInverted.Landscape { > +margin-bottom: $CB_M_BOTTOM; > +margin-right: $CB_SPACE_RIGHT; > +} > +#CommonTopButtonPositiveInverted:pressed { > +background-image:$CB_BG_POSITIVE_INVERTED_PRESSED > $CORNER_MARGINS; > +} > +#CommonTopButtonPositiveInverted:selected { > +background-image:$CB_BG_POSITIVE_INVERTED_SELECTED > $CORNER_MARGINS; > +} > + > +#CommonVerticalCenterButtonPositiveInverted { > +text-color: $CB_FONT_COLOR_POSITIVE; > +background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS; > +} > +#CommonVerticalCenterButtonPositiveInverted.Portrait { > +margin-top: $CB_SPACE_TOP; > +margin-bottom: $CB_SPACE_BOTTOM; > +margin-left: $CB_M_LEFT; > +margin-right: $CB_M_RIGHT; > +} > +#CommonVerticalCenterButtonPositiveInverted.Landscape { > +margin-top: $CB_M_TOP; > +margin-bottom: $CB_M_BOTTOM; > +margin-left: $CB_SPACE_LEFT; > +margin-right: $CB_SPACE_RIGHT; > +} > +#CommonVerticalCenterButtonPositiveInverted:pressed { > +background-image:$CB_BG_POSITIVE_INVERTED_PRESSED > $CORNER_MARGINS; > +} > +#CommonVerticalCenterButtonPositiveInverted:selected { > +background-image:$CB_BG_POSITIVE_INVERTED_SELECTED > $CORNER_MARGINS; > +} > + > +#CommonBottomButtonPositiveInverted { > +margin-bottom: $CB_M_BOTTOM; > +margin-right: $CB_M_RIGHT; > + > +text-color: $CB_FONT_COLOR_POSITIVE; > +background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS; > +} > +#CommonBottomButtonPositiveInverted.Portrait { > +margin-top: $CB_SPACE_TOP; > +margin-left: $CB_M_LEFT; > +} > +#CommonBottomButtonPositiveInverted.Landscape { > +margin-top: $CB_M_TOP; > +margin-left: $CB_SPACE_LEFT; > +} > +#CommonBottomButtonPositiveInverted:pressed { > +background-image:$CB_BG_POSITIVE_INVERTED_PRESSED > $CORNER_MARGINS; > +} > +#CommonBottomButtonPositiveInverted:selected { > +background-image:$CB_BG_POSITIVE_INVERTED_SELECTED > $CORNER_MARGINS; > +} > + > +/* negative inverted buttons */ > + > +#CommonSingleButtonNegativeInverted { > +margin-top: $CB_M_TOP; > +margin-bottom: $CB_M_BOTTOM; > +margin-left: $CB_M_LEFT; > +margin-right: $CB_M_RIGHT; > +text-color: $CB_FONT_COLOR_NEGATIVE; > +background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS; > +} > +#CommonSingleButtonNegativeInverted:pressed { > +background-image:$CB_BG_NEGATIVE_INVERTED_PRESSED > $CORNER_MARGINS; > +} > +#CommonSingleButtonNegativeInverted:selected { > +background-image:$CB_BG_NEGATIVE_INVERTED_SELECTED > $CORNER_MARGINS; > +} > + > +#CommonLeftButtonNegativeInverted { > +margin-top: $CB_M_TOP; > +margin-bottom: $CB_M_BOTTOM; > +margin-left: $CB_M_LEFT; > +margin-right: $CB_SPACE_RIGHT; > + > +text-color: $CB_FONT_COLOR_NEGATIVE; > +background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS; > +} > +#CommonLeftButtonNegativeInverted:pressed { > +background-image:$CB_BG_NEGATIVE_INVERTED_PRESSED > $CORNER_MARGINS; > +} > +#CommonLeftButtonNegativeInverted:selected { > +background-image:$CB_BG_NEGATIVE_INVERTED_SELECTED > $CORNER_MARGINS; > +} > + > +#CommonHorizontalCenterButtonNegativeInverted { > +margin-top: $CB_M_TOP; > +margin-bottom: $CB_M_BOTTOM; > +margin-left: $CB_SPACE_LEFT; > +margin-right: $CB_SPACE_RIGHT; > +text-color: $CB_FONT_COLOR_NEGATIVE; > +background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS; > +} > + > +#CommonRightButtonNegativeInverted { > +margin-top: $CB_M_TOP; > +margin-bottom: $CB_M_BOTTOM; > +margin-left: $CB_SPACE_LEFT; > +margin-right: $CB_M_RIGHT; > +text-color: $CB_FONT_COLOR_NEGATIVE; > +background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS; > +} > +#CommonRightButtonNegativeInverted:pressed { > +background-image:$CB_BG_NEGATIVE_INVERTED_PRESSED > $CORNER_MARGINS; > +} > +#CommonRightButtonNegativeInverted:selected { > +background-image:$CB_BG_NEGATIVE_INVERTED_SELECTED > $CORNER_MARGINS; > +} > + > +#CommonTopButtonNegativeInverted { > +margin-top: $CB_M_TOP; > +margin-left: $CB_M_LEFT; > + > +text-color: $CB_FONT_COLOR_NEGATIVE; > +background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS; > +} > +#CommonTopButtonNegativeInverted.Portrait { > +margin-bottom: $CB_SPACE_BOTTOM; > +margin-right: $CB_M_RIGHT; > +} > +#CommonTopButtonNegativeInverted.Landscape { > +margin-bottom: $CB_M_BOTTOM; > +margin-right: $CB_SPACE_RIGHT; > +} > +#CommonTopButtonNegativeInverted:pressed { > +background-image:$CB_BG_NEGATIVE_INVERTED_PRESSED > $CORNER_MARGINS; > +} > +#CommonTopButtonNegativeInverted:selected { > +background-image:$CB_BG_NEGATIVE_INVERTED_SELECTED > $CORNER_MARGINS; > +} > + > +#CommonVerticalCenterButtonNegativeInverted { > +text-color: $CB_FONT_COLOR_NEGATIVE; > +background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS; > +} > +#CommonVerticalCenterButtonNegativeInverted.Portrait { > +margin-top: $CB_SPACE_TOP; > +margin-bottom: $CB_SPACE_BOTTOM; > +margin-left: $CB_M_LEFT; > +margin-right: $CB_M_RIGHT; > +} > +#CommonVerticalCenterButtonNegativeInverted.Landscape { > +margin-top: $CB_M_TOP; > +margin-bottom: $CB_M_BOTTOM; > +margin-left: $CB_SPACE_LEFT; > +margin-right: $CB_SPACE_RIGHT; > +} > +#CommonVerticalCenterButtonNegativeInverted:pressed { > +background-image:$CB_BG_NEGATIVE_INVERTED_PRESSED > $CORNER_MARGINS; > +} > +#CommonVerticalCenterButtonNegativeInverted:selected { > +background-image:$CB_BG_NEGATIVE_INVERTED_SELECTED > $CORNER_MARGINS; > +} > + > +#CommonBottomButtonNegativeInverted { > +margin-bottom: $CB_M_BOTTOM; > +margin-right: $CB_M_RIGHT; > + > +text-color: $CB_FONT_COLOR_NEGATIVE; > +background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS; > +} > +#CommonBottomButtonNegativeInverted.Portrait { > +margin-top: $CB_SPACE_TOP; > +margin-left: $CB_M_LEFT; > +} > +#CommonBottomButtonNegativeInverted.Landscape { > +margin-top: $CB_M_TOP; > +margin-left: $CB_SPACE_LEFT; > +} > +#CommonBottomButtonNegativeInverted:pressed { > +background-image:$CB_BG_NEGATIVE_INVERTED_PRESSED > $CORNER_MARGINS; > +} > +#CommonBottomButtonNegativeInverted:selected { > +background-image:$CB_BG_NEGATIVE_INVERTED_SELECTED > $CORNER_MARGINS; > +} > + > + > /* split-buttons for default application background color */ > > #CommonLeftSplitButton { > @@ -860,6 +1099,190 @@ > > background-image:meegotouch-button-inverted-background-selected-horizont > al-right $CORNER_MARGINS; > text-color: $CB_FONT_COLOR_INVERTED_SELECTED; > } > + > +/* special buttons */ > + > +#CommonQueryButton { > +margin-top: $CB_M_TOP; > +margin-bottom: $CB_M_BOTTOM; > +margin-left: 0.3mm; > +margin-right: 0.3mm; > + > +minimum-size: 20.6mm 5.1mm; > +maximum-size:20.6mm 5.1mm; > +preferred-size:20.6mm 5.1mm; > + > +text-color: $CB_FONT_COLOR_INVERTED; > +background-image:$CB_BG_INVERTED $CORNER_MARGINS; > +} > +#CommonQueryButton:pressed { > +background-image:$CB_BG_INVERTED_PRESSED $CORNER_MARGINS; > +text-color: $CB_FONT_COLOR_INVERTED_PRESSED; > +} > +#CommonQueryButton:selected { > +background-image:$CB_BG_INVERTED_SELECTED $CORNER_MARGINS; > +text-color: $CB_FONT_COLOR_INVERTED_SELECTED; > +} > + > +#CommonListIconButton { > +margin-right: $INDENT_DEFAULT; > +} > +#CommonListIconButtonInverted { > +margin-right: $INDENT_DEFAULT; > +} > + > +#CommonListButton { > +background-image: 'meegotouch-textedit-button-background' 20px 20px 20px > 20px; > +minimum-size: 4.2mm 4.3mm; > +preferred-size: 4.2mm 4.3mm; > +maximum-size: 12.2mm 4.3mm; > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +} > +#CommonListButton:pressed { > +background-image: 'meegotouch-textedit-button-background-pressed' 20px > 20px 20px 20px; > +} > +#CommonListButton:selected { > +background-image: 'meegotouch-textedit-button-background-selected' 20px > 20px 20px 20px; > +} > + > +#CommonListButtonInverted { > +background-image: 'meegotouch-textedit-button-inverted-background' 20px > 20px 20px 20px; > +minimum-size: 4.2mm 4.3mm; > +preferred-size: 4.2mm 4.3mm; > +maximum-size: 12.2mm 4.3mm; > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +} > +#CommonListButtonInverted:pressed { > +background-image: > 'meegotouch-textedit-button-inverted-background-pressed' 20px 20px 20px > 20px; > +} > +#CommonListButtonInverted:selected { > +background-image: > 'meegotouch-textedit-button-inverted-background-selected' 20px 20px 20px > 20px; > +} > + > +/* Toolbar buttons */ > + > +#CommonToolbarButton { > +background-image: > 'meegotouch-button-navigationbar-tab-button-background' $TBB_CORNERS; > +minimum-size: $TBB_HEIGHT $TBB_HEIGHT; > +preferred-size: $TBB_WIDTH $TBB_HEIGHT; > +maximum-size: $TBB_WIDTH $TBB_HEIGHT; > +margin-left: $MARGIN_SMALL; > +margin-right: $MARGIN_SMALL; > +} > +#CommonToolbarButton:pressed { > +background-image: > 'meegotouch-button-navigationbar-tab-button-background-pressed' > $TBB_CORNERS; > +} > +#CommonToolbarButton:selected { > +background-image: > 'meegotouch-button-navigationbar-tab-button-background-selected' > $TBB_CORNERS; > +} > +#CommonToolbarLeftSplitButton { > +background-image: > 'meegotouch-button-navigationbar-tab-button-background-horizontal-left' > $TBSB_CORNERS; > +minimum-size: $TBSB_HEIGHT $TBSB_HEIGHT; > +preferred-size: $TBSB_WIDTH $TBSB_HEIGHT; > +maximum-size: $TBSB_WIDTH $TBSB_HEIGHT; > +margin-left: $MARGIN_SMALL; > +margin-right: 0; > +} > +#CommonToolbarLeftSplitButton:pressed { > +background-image: > 'meegotouch-button-navigationbar-tab-button-background-horizontal-left-pres > sed' $TBSB_CORNERS; > +} > +#CommonToolbarLeftSplitButton:selected { > +background-image: > 'meegotouch-button-navigationbar-tab-button-background-horizontal-left-sele > cted' $TBSB_CORNERS; > +} > +#CommonToolbarCenterSplitButton { > +background-image: > 'meegotouch-button-navigationbar-tab-button-background-horizontal-center' > $TBSB_CORNERS; > +minimum-size: $TBSB_HEIGHT $TBSB_HEIGHT; > +preferred-size: $TBSB_WIDTH $TBSB_HEIGHT; > +maximum-size: $TBSB_WIDTH $TBSB_HEIGHT; > +margin-left: 0; > +margin-right: 0; > +} > +#CommonToolbarCenterSplitButton:pressed { > +background-image: > 'meegotouch-button-navigationbar-tab-button-background-horizontal-center-p > ressed' $TBSB_CORNERS; > +} > +#CommonToolbarCenterSplitButton:selected { > +background-image: > 'meegotouch-button-navigationbar-tab-button-background-horizontal-center-s > elected' $TSBB_CORNERS; > +} > +#CommonToolbarRightSplitButton { > +background-image: > 'meegotouch-button-navigationbar-tab-button-background-horizontal-right' > $TBSB_CORNERS; > +minimum-size: $TBSB_HEIGHT $TBSB_HEIGHT; > +preferred-size: $TBSB_WIDTH $TBSB_HEIGHT; > +maximum-size: $TBSB_WIDTH $TBSB_HEIGHT; > +margin-left: 0; > +margin-right: $MARGIN_SMALL; > +} > +#CommonToolbarRightSplitButton:pressed { > +background-image: > 'meegotouch-button-navigationbar-tab-button-background-horizontal-right-pre > ssed' $TBSB_CORNERS; > +} > +#CommonToolbarRightSplitButton:selected { > +background-image: > 'meegotouch-button-navigationbar-tab-button-background-horizontal-right-sel > ected' $TBSB_CORNERS; > +} > +#CommonOverlayToolbarButton { > +/* TBD */ > +} > + > +/* Input Field Buttons */ > + > +#CommonRightInputFieldButton { > +background-image: 'meegotouch-textedit-button-background' 20px 20px 20px > 20px; > +minimum-size: 4.2mm 4.3mm; > +preferred-size: 4.2mm 4.3mm; > +maximum-size: 12.2mm 4.3mm; > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +} > +#CommonRightInputFieldButton:pressed { > +background-image: 'meegotouch-textedit-button-background-pressed' 20px > 20px 20px 20px; > +} > +#CommonRightInputFieldButton:selected { > +background-image: 'meegotouch-textedit-button-background-selected' 20px > 20px 20px 20px; > +} > +#CommonLeftInputFieldButton { > +background-image: 'meegotouch-textedit-button-background' 20px 20px 20px > 20px; > +minimum-size: 4.2mm 4.3mm; > +preferred-size: 4.2mm 4.3mm; > +maximum-size: 12.2mm 4.3mm; > +margin-left: $INDENT_DEFAULT; > +margin-right: 0; > +} > +#CommonLeftInputFieldButton:pressed { > +background-image: 'meegotouch-textedit-button-background-pressed' 20px > 20px 20px 20px; > +} > +#CommonLeftInputFieldButton:selected { > +background-image: 'meegotouch-textedit-button-background-selected' 20px > 20px 20px 20px; > +} > + > +#CommonRightInputFieldButtonInverted { > +background-image: 'meegotouch-textedit-button-inverted-background' 20px > 20px 20px 20px; > +minimum-size: 4.2mm 4.3mm; > +preferred-size: 4.2mm 4.3mm; > +maximum-size: 12.2mm 4.3mm; > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +} > +#CommonRightInputFieldButtonInverted:pressed { > +background-image: > 'meegotouch-textedit-button-inverted-background-pressed' 20px 20px 20px > 20px; > +} > +#CommonRightInputFieldButtonInverted:selected { > +background-image: > 'meegotouch-textedit-button-inverted-background-selected' 20px 20px 20px > 20px; > +} > +#CommonLeftInputFieldButtonInverted { > +background-image: 'meegotouch-textedit-button-inverted-background' 20px > 20px 20px 20px; > +minimum-size: 4.2mm 4.3mm; > +preferred-size: 4.2mm 4.3mm; > +maximum-size: 12.2mm 4.3mm; > +margin-left: $INDENT_DEFAULT; > +margin-right: 0; > +} > +#CommonLeftInputFieldButtonInverted:pressed { > +background-image: > 'meegotouch-textedit-button-inverted-background-pressed' 20px 20px 20px > 20px; > +} > +#CommonLeftInputFieldButtonInverted:selected { > +background-image: > 'meegotouch-textedit-button-inverted-background-selected' 20px 20px 20px > 20px; > +} > + > /* Temp for camera, needs to become moved */ > > #CommonIconButton { > --- > base/meegotouch/libmeegotouchviews/style/commonlayouts/commoniconstyl > e.css > +++ > base/meegotouch/libmeegotouchviews/style/commonlayouts/commoniconstyl > e.css > @@ -8,10 +8,30 @@ > maximum-size: $ICON64; > minimum-size: $ICON64; > preferred-size: $ICON64; > -margin-left: $MARGIN_DOUBLE; > -margin-right: $MARGIN_DOUBLE; > -margin-top: $MARGIN_DOUBLE; > -margin-bottom: $MARGIN_DOUBLE; > +margin-left: $INDENT_DEFAULT; > +margin-right: 0; > +margin-top: $MARGIN_LARGE; > +margin-bottom: $MARGIN_LARGE; > +} > + > +#CommonRightMainIcon { > +maximum-size: $ICON64; > +minimum-size: $ICON64; > +preferred-size: $ICON64; > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +margin-top: $MARGIN_LARGE; > +margin-bottom: $MARGIN_LARGE; > +} > + > +#CommonRightIcon { > +maximum-size: $ICON32; > +minimum-size: $ICON32; > +preferred-size: $ICON32; > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +margin-top: 0; > +margin-bottom: 0; > } > > #CommonTitleIcon { > @@ -24,6 +44,26 @@ > margin-bottom: 0; > } > > +#CommonDrillDownIcon { > +maximum-size: $ICON32; > +minimum-size: $ICON32; > +preferred-size: $ICON32; > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +margin-top: 0; > +margin-bottom: 0; > +} > + > +#CommonComboBoxIcon { > +maximum-size: $ICON32; > +minimum-size: $ICON32; > +preferred-size: $ICON32; > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +margin-top: 0; > +margin-bottom: 0; > +} > + > #CommonSettingsIcon { > maximum-size: $ICON64; > minimum-size: $ICON64; > @@ -45,6 +85,16 @@ > margin-left: $INDENT_DEFAULT; > } > > +#CommonViewHeaderIcon { > +maximum-size: $ICON24; > +minimum-size: $ICON24; > +preferred-size: $ICON24; > +margin-left: $INDENT_DEFAULT; > +margin-right: 0; > +margin-top: 0; > +margin-bottom: 0; > +} > + > #CommonSubIcon { > maximum-size: $ICON24; > minimum-size: $ICON24; > @@ -103,13 +153,23 @@ > } > > #CommonThumbnail { > -maximum-size: $ICON80; > -minimum-size: $ICON80; > -preferred-size: $ICON80; > -margin-left: 0.8mm; > +maximum-size: $ICON64; > +minimum-size: $ICON64; > +preferred-size: $ICON64; > +margin-left: $INDENT_DEFAULT; > margin-right: 0; > -margin-top: 0.4mm; > -margin-bottom: 0.4mm; > +margin-top: $MARGIN_LARGE; > +margin-bottom: $MARGIN_LARGE; > +} > + > +#CommonRightThumbnail { > +maximum-size: $ICON64; > +minimum-size: $ICON64; > +preferred-size: $ICON64; > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +margin-top: $MARGIN_LARGE; > +margin-bottom: $MARGIN_LARGE; > } > > #CommonAvatarPlaceholder { > --- > base/meegotouch/libmeegotouchviews/style/commonlayouts/commonlayouts > tyle.css > +++ > base/meegotouch/libmeegotouchviews/style/commonlayouts/commonlayouts > tyle.css > @@ -1,6 +1,35 @@ > +/* Divider */ > > +#CommonItemDivider { > +background-image: 'meegotouch-separator-background-horizontal' 4px 4px > 2px 2px; > +span: 0.9mm; > +margin-top: 0; > +margin-bottom: 0; > +margin-left: 0; > +margin-right: 0; > +} > + > +#CommonGroupDivider { > +background-image: 'meegotouch-groupseparator-background-horizontal' 4px > 4px 2px 2px; > +span: 0.9mm; > +margin-top: 0; > +margin-bottom: 0; > +margin-left: 0; > +margin-right: 0; > +} > + > +#CommonGroupHeaderDivider { > +background-image: > 'meegotouch-groupseparator-header-background-horizontal' 4px 4px 2px 2px; > +span: 0.9mm; > +margin-top: 0; > +margin-bottom: 0; > +margin-left: 0; > +margin-right: 0; > +} > > #CommonHorizontalSeparator { > +background-image: 'meegotouch-separator-background-horizontal' 4px 4px > 2px 2px; > +span: 0.1mm; > margin-top: 0; > margin-bottom: 0; > margin-left: 0; > @@ -8,35 +37,64 @@ > } > > #CommonVerticalSeparator { > +background-image: 'meegotouch-separator-background-vertical' 4px 4px 2px > 2px; > margin-right: 0; > margin-left: 0; > margin-bottom: 0; > margin-top: 0; > } > > -#CommonDivider { > + > +#CommonItemDividerInverted { > +background-image: 'meegotouch-separator-inverted-background-horizontal' > 4px 4px 2px 2px; > +span: 0.9mm; > margin-top: 0; > margin-bottom: 0; > margin-left: 0; > margin-right: 0; > } > -#CommonItemDivider { > + > +#CommonGroupDividerInverted { > +background-image: > 'meegotouch-groupseparator-inverted-background-horizontal' 4px 4px 2px 2px; > +span: 0.9mm; > margin-top: 0; > margin-bottom: 0; > margin-left: 0; > margin-right: 0; > } > -#CommonGroupDivider { > + > +#CommonGroupHeaderDividerInverted { > +background-image: > 'meegotouch-groupseparator-header-inverted-background-horizontal' 4px 4px > 2px 2px; > +span: 0.9mm; > margin-top: 0; > margin-bottom: 0; > margin-left: 0; > margin-right: 0; > } > > +#CommonHorizontalSeparatorInverted { > +background-image: 'meegotouch-separator-inverted-background-horizontal' > 4px 4px 2px 2px; > +span: 0.1mm; > +margin-top: 0; > +margin-bottom: 0; > +margin-left: 0; > +margin-right: 0; > +} > + > +#CommonVerticalSeparatorInverted { > +background-image: 'meegotouch-separator-inverted-background-vertical' 4px > 4px 2px 2px; > +margin-right: 0; > +margin-left: 0; > +margin-bottom: 0; > +margin-top: 0; > +} > + > +/* Spacer */ > + > #CommonSpacer { > minimum-size: 0 0; > -preferred-size: 100.0mm 0; > -maximum-size: 100.0mm 0; > +preferred-size: 100% 0; > +maximum-size: 100% 0; > margin-top: $MARGIN_DOUBLE; > margin-bottom: 0; > margin-left: 0; > @@ -45,14 +103,16 @@ > > #CommonSmallSpacer { > minimum-size: 0 0; > -preferred-size: 100.0mm 0; > -maximum-size: 100.0mm 0; > +preferred-size: 100% 0; > +maximum-size: 100% 0; > margin-top: $MARGIN_SMALL; > margin-bottom: 0; > margin-left: 0; > margin-right: 0; > } > > +/* Groups */ > + > #CommonTitleIconGroup { > margin-left: $INDENT_DEFAULT; > } > --- > base/meegotouch/libmeegotouchviews/style/commonlayouts/commonpanelst > yle.css > +++ > base/meegotouch/libmeegotouchviews/style/commonlayouts/commonpanelst > yle.css > @@ -54,6 +54,47 @@ > background-image: $CP_INVERTED_BG_SELECTED; > } > > +#CommonPanelNoFeedback { > +minimum-size: $SIZE_LIST $SIZE_LIST; > +preferred-size: -1 $SIZE_LIST; > +maximum-size: -1 $SIZE_LIST; > +background-tiles: ; > +background-image: $CP_BG; > +margin-top: 0; > +margin-bottom: 0; > +margin-left: 0; > +margin-right: 0; > +} > +#CommonPanelNoFeedback:pressed { > +background-tiles: ; > +background-image: $CP_BG; > +} > +#CommonPanelNoFeedback:selected { > +background-tiles: ; > +background-image: $CP_BG; > + > +} > + > +#CommonPanelNoFeedbackInverted { > +minimum-size: $SIZE_LIST $SIZE_LIST; > +preferred-size: -1 $SIZE_LIST; > +maximum-size: -1 $SIZE_LIST; > +background-tiles: ; > +background-image: $CP_INVERTED_BG; > +margin-top: 0; > +margin-bottom: 0; > +margin-left: 0; > +margin-right: 0; > +} > +#CommonPanelNoFeedbackInverted:pressed { > +background-tiles: ; > +background-image: $CP_INVERTED_BG; > +} > +#CommonPanelNoFeedbackInverted:selected { > +background-tiles: ; > +background-image: $CP_INVERTED_BG; > +} > + > #CommonUnreadPanel { > minimum-size: $SIZE_LIST $SIZE_LIST; > preferred-size: -1 $SIZE_LIST; > @@ -174,6 +215,8 @@ > background-image: $CP_INVERTED_BG_SELECTED; > } > > +/* Header panels */ > + > #CommonXLargeGroupHeaderPanel { > minimum-size: 72 72; > preferred-size: -1 72; > @@ -262,3 +305,66 @@ > margin-left: 0; > margin-right: 0; > } > + > +/* View Header panels */ > + > +#CommonViewHeaderPanel { > +minimum-size: 40 40; > +preferred-size: 100% 40; > +maximum-size: 100% -1; > +background-tiles: ; > +background-image: 'meegotouch-view-header' 15px 15px 15px 15px; > +margin-top: 0; > +margin-bottom: 0; > +margin-left: 0; > +margin-right: 0; > +} > + > +#CommonViewHeaderPanelInverted { > +minimum-size: 40 40; > +preferred-size: 100% 40; > +maximum-size: 100% -1; > +background-tiles: ; > +background-image: 'meegotouch-view-header-inverted' 15px 15px 15px > 15px; > +margin-top: 0; > +margin-bottom: 0; > +margin-left: 0; > +margin-right: 0; > +} > + > +#CommonViewHeaderPanelColored { > +minimum-size: 40 40; > +preferred-size: 100% 40; > +maximum-size: 100% -1; > +background-tiles: ; > +background-image: 'meegotouch-view-header-colored' 15px 15px 15px > 15px; > +margin-top: 0; > +margin-bottom: 0; > +margin-left: 0; > +margin-right: 0; > +} > + > +#CommonViewHeaderPanelColoredInverted { > +minimum-size: 40 40; > +preferred-size: 100% 40; > +maximum-size: 100% -1; > +background-tiles: ; > +background-image: 'meegotouch-view-header-colored-inverted' 15px 15px > 15px 15px; > +margin-top: 0; > +margin-bottom: 0; > +margin-left: 0; > +margin-right: 0; > +} > + > +#CommonOverlayViewHeaderPanel { > +minimum-size: 40 40; > +preferred-size: 100% -1; > +maximum-size: 100% -1; > +background-tiles: ; > +background-image: 'meegotouch-view-header-overlay' 15px 15px 15px > 15px; > +margin-top: 0; > +margin-bottom: 0; > +margin-left: 0; > +margin-right: 0; > +} > + > --- > base/meegotouch/libmeegotouchviews/style/commonlayouts/commonuicontr > olstyle.css > +++ > base/meegotouch/libmeegotouchviews/style/commonlayouts/commonuicontr > olstyle.css > @@ -3,6 +3,7 @@ > @const C_INPUT_BG_INVERTED: meegotouch-textedit-background > $CORNER_MARGINS; > @const C_INPUT_BG_SELECTED_INVERTED: > meegotouch-textedit-background-selected $CORNER_MARGINS; > > +/* switch */ > > #CommonSwitch { > margin-left: $INDENT_DEFAULT; > @@ -16,6 +17,20 @@ > margin-left: 0; > margin-right: $INDENT_DEFAULT; > } > +#CommonSwitchInverted { > +margin-left: $INDENT_DEFAULT; > +margin-right: $INDENT_DEFAULT; > +} > +#CommonLeftSwitchInverted { > +margin-left: $INDENT_DEFAULT; > +margin-right: 0; > +} > +#CommonRightSwitchInverted { > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +} > + > +/* Checkbox */ > > #CommonCheckBox { > margin-left: $INDENT_DEFAULT; > @@ -30,6 +45,21 @@ > margin-right: $INDENT_DEFAULT; > } > > +#CommonCheckBoxInverted { > +margin-left: $INDENT_DEFAULT; > +margin-right: $INDENT_DEFAULT; > +} > +#CommonLeftCheckBoxInverted { > +margin-left: $INDENT_DEFAULT; > +margin-right: 0; > +} > +#CommonRightCheckBoxInverted { > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +} > + > +/* Radio Button */ > + > #CommonRadioButton { > margin-left: $INDENT_DEFAULT; > margin-right: $INDENT_DEFAULT; > @@ -43,6 +73,21 @@ > margin-right: $INDENT_DEFAULT; > } > > +#CommonRadioButtonInverted { > +margin-left: $INDENT_DEFAULT; > +margin-right: $INDENT_DEFAULT; > +} > +#CommonLeftRadioButtonInverted { > +margin-left: $INDENT_DEFAULT; > +margin-right: 0; > +} > +#CommonRightRadioButtonInverted { > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +} > + > +/* Slider */ > + > #CommonSlider { > margin-top: $MARGIN_DOUBLE; > margin-bottom: $MARGIN_DOUBLE; > @@ -53,6 +98,18 @@ > maximum-size: 44.8mm -1; > } > > +#CommonSliderInverted { > +margin-top: $MARGIN_DOUBLE; > +margin-bottom: $MARGIN_DOUBLE; > +margin-left: $INDENT_DEFAULT; > +margin-right: $INDENT_DEFAULT; > +minimum-size: 32.2mm -1; > +preferred-size: 44.8mm -1; > +maximum-size: 44.8mm -1; > +} > + > +/* Spinner */ > + > #CommonViewHeaderSpinner { > margin-top: $MARGIN_LARGE; > margin-bottom: $MARGIN_LARGE; > @@ -81,6 +138,36 @@ > maximum-size: 9.6mm 9.6mm; > } > > +#CommonViewHeaderSpinnerInverted { > +margin-top: $MARGIN_LARGE; > +margin-bottom: $MARGIN_LARGE; > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +minimum-size: 2.4mm 2.4mm; > +preferred-size: 2.4mm 2.4mm; > +maximum-size: 2.4mm 2.4mm; > +} > +#CommonListItemSpinnerInverted { > +margin-top: 0; > +margin-bottom: 0; > +margin-left: 0; > +margin-right: $INDENT_DEFAULT; > +minimum-size: 3.2mm 3.2mm; > +preferred-size: 3.2mm 3.2mm; > +maximum-size: 3.2mm 3.2mm; > +} > +#CommonViewHeaderSpinnerInverted { > +margin-top: 0; > +margin-bottom: 0; > +margin-left: 0; > +margin-right: 0; > +minimum-size: 9.6mm 9.6mm; > +preferred-size: 9.6mm 9.6mm; > +maximum-size: 9.6mm 9.6mm; > +} > + > +/* Progress bar */ > + > #CommonProgressBar { > margin-top: $MARGIN_DOUBLE; > margin-bottom: $MARGIN_DOUBLE; > @@ -91,6 +178,16 @@ > preferred-size: 44.8mm -1; > maximum-size: 44.8mm -1; */ > } > +#CommonProgressBarInverted { > +margin-top: $MARGIN_DOUBLE; > +margin-bottom: $MARGIN_DOUBLE; > +margin-left: $INDENT_DEFAULT; > +margin-right: $INDENT_DEFAULT; > +/* This is causing problems at MAdvanceListItem Fix me > +minimum-size: 32.2mm -1; > +preferred-size: 44.8mm -1; > +maximum-size: 44.8mm -1; */ > +} > > /* Input Fields */ > > @@ -179,6 +276,11 @@ > margin-right: $INDENT_DEFAULT; > } > > +#CommonToolbarInputField { > +margin-left: $INDENT_DEFAULT; > +margin-right: $INDENT_DEFAULT; > +} > + > /* Inverted Input Fields */ > > #CommonSingleInputFieldInverted { > @@ -271,6 +373,10 @@ > > /* Special items */ > > +#CommonOverlayComboBox { > +/* TBD */ > +} > + > #CommonCountBubble { > margin-right: $INDENT_DEFAULT; > } > --- base/meegotouch/libmeegotouchviews/style/mbannerstyle.css > +++ base/meegotouch/libmeegotouchviews/style/mbannerstyle.css > @@ -1,70 +1,255 @@ > /* MBannerStyle : MWidgetStyle */ > MBannerStyle { > - icon-size: $SIZE_ICON_LARGE $SIZE_ICON_LARGE; > - maximum-size: 100% 6.4mm; > - padding-left: $MARGIN_XLARGE; > - padding-right: $MARGIN_XLARGE; > + icon-size: 0 0; > + padding-top: 0; > + padding-bottom:0; > + padding-right: 0; > + padding-left: 0; > + > disappear-timeout: 3000; > - /* MBanner without styleName will use by default event background*/ > +} > + > +MBanner MLabelStyle { > + margin-top:0; > + margin-bottom:0; > + margin-left:0; > + margin-right:0; > + > + padding-top:0; > + padding-bottom:0; > + padding-right:0; > + padding-left:0; > +} > + > +/* Event Banner */ > + > +MBannerStyle #EventBanner { > + icon-size: 1.5mm 1.5mm; > + minimum-size: 100% 3.6mm; > + maximum-size: 100% 3.6mm; > + preferred-size: 100% 3.6mm; > background-image: "meegotouch-notification-event-background" 10px > 10px 10px 10px; > - color: $COLOR_FOREGROUND; /* To avoid white over white */ > + margin-bottom:2.0mm; > } > > -MBannerStyle.Portrait { > - icon-size: $SIZE_ICON_LARGE $SIZE_ICON_LARGE; > - maximum-size: 100% 6.4mm; > - padding-left: $MARGIN_XLARGE; > - padding-right: $MARGIN_XLARGE; > - disappear-timeout: 3000; > +MBannerStyle #EventBanner:pressed { > + background-image: > "meegotouch-notification-event-background-pressed" 10px 10px 10px 10px; > } > > -#MBannerTitle{ > - font: $FONT_DEFAULT_BOLD; > +#MBannerTitleEvent { > + font: $FONT_XSMALL_BOLD; > color: $COLOR_INVERTED_FOREGROUND; > - margin-right: $MARGIN_XXLARGE; > - margin-bottom:-3; > + margin-right: $MARGIN_LARGE; > + margin-left: $MARGIN_LARGE; > } > > -#MBannerSubtitle{ > - font: $FONT_XSMALL; > +#MBannerSubtitleEvent{ > + font: $FONT_XSMALL_REGULAR; > color: $COLOR_INVERTED_FOREGROUND; > - margin-top:-3; > } > > -#MBannerSubtitleSingle{ > - font: $FONT_XSMALL; > - color: $COLOR_INVERTED_FOREGROUND; > +#MBannerIconEvent{ > + margin-left:0.1mm; > } > +/* Event banner at event screen */ > > -#MBannerIcon{ > - maximum-size: 4.8mm 4.8mm; > - minimum-size: 4.8mm 4.8mm; > - preferred-size: 4.8mm 4.8mm; > - margin-right: $MARGIN_XLARGE; > +MBannerStyle #EventScreen { > + minimum-size: 40mm 13.5mm; > + maximum-size: 40mm 13.5mm; > + preferred-size: 40mm 13.5mm; > + icon-size: 5mm 5mm; > + background-image: "meegotouch-notification-lockscreen-background" > 10px 10px 10px 10px; > +} > + > +#HeadLine { > + font: $FONT_XSMALL_BOLD; > + margin-top: 3mm; > + color:$COLOR_INVERTED_FOREGROUND; > +} > +#IconScreen { > + maximum-size: 5mm 5mm; > + minimum-size: 5mm 5mm; > + preferred-size: 5mm 5mm; > + > + margin-right: 2mm; > + margin-top:3mm; > + margin-left:3mm; > + margin-bottom:5.5mm; > +} > +#Body { > + /*font: $FONT_DEFAULT_LIGHT; */ > + /* opacity: 0.5; */ > + color:$COLOR_INVERTED_FOREGROUND; > + /*margin-bottom:5.5mm; */ > + margin-top:0.6mm; > +} > + > +#TimeStamp { > + font: $FONT_XSMALL_BOLD; > + color:$COLOR_INVERTED_FOREGROUND; > + margin-bottom:0.3mm; > +} > + > +/* Event banner at lock screen */ > + > +MBannerStyle #LockScreen { > + minimum-size: 40mm 13.5mm; > + maximum-size: 40mm 13.5mm; > + preferred-size: 40mm 13.5mm; > + icon-size: 5mm 5mm; > + background-image: "meegotouch-notification-lockscreen-background" > 10px 10px 10px 10px; > +} > + > +#HeadLine { > + font: $FONT_XSMALL_BOLD; > + margin-top: 3mm; > + color:$COLOR_INVERTED_FOREGROUND; > +} > +#IconScreen { > + maximum-size: 5mm 5mm; > + minimum-size: 5mm 5mm; > + preferred-size: 5mm 5mm; > + > + margin-right: 2mm; > + margin-top:3mm; > + margin-left:3mm; > + margin-bottom:5.5mm; > +} > +#Body { > + /*font: $FONT_DEFAULT_LIGHT; */ > + /* opacity: 0.5; */ > + color:$COLOR_INVERTED_FOREGROUND; > + /*margin-bottom:5.5mm; */ > + margin-top:0.6mm; > +} > + > +#TimeStamp { > + font: $FONT_XSMALL_BOLD; > + color:$COLOR_INVERTED_FOREGROUND; > + margin-bottom:0.3mm; > +} > + > +MBannerStyle #SystemBanner { > + /*System banners hasn't icon*/ > + icon-size: 0 0; > + margin-right: $MARGIN_LARGE; > + margin-top:$MARGIN_LARGE; > + margin-left:$MARGIN_LARGE; > + margin-bottom:$MARGIN_LARGE; > + background-image: "meegotouch-notification-system-background" 10px > 10px 10px 10px; > } > > -/* Use styleName to setup one of this MBanner: EventBanner, > InformationBanner, SystemBanner */ > +MBannerStyle #SystemBanner:pressed { > + background-image: > "meegotouch-notification-system-background-pressed" 10px 10px 10px 10px; > +} > > -MBannerStyle#EventBanner { > - background-image: "meegotouch-notification-event-background" 10px > 10px 10px 10px; > +MBannerStyle #SystemBanner.Landscape { > + maximum-size: 83.8mm 8mm; > + minimum-size: 46.6mm 6.4mm; > + preferred-size: 83.8mm -1; > } > > -MBannerStyle#EventBanner:pressed { > - background-image: > "meegotouch-notification-event-background-pressed" 10px 10px 10px 10px; > +MBannerStyle #SystemBanner.Portrait { > + maximum-size: 46.4mm 10.6mm; > + minimum-size: 46.4mm 6.4mm; > + preferred-size: 46.4mm -1; > +} > + > +#MBannerTitleSystem { > + color:$COLOR_INVERTED_FOREGROUND; > + font: $FONT_DEFAULT; > + margin-left: $INDENT_DEFAULT; > + margin-right: $INDENT_DEFAULT; > } > +/* Information Banner */ > > -MBannerStyle#InformationBanner { > +MBannerStyle #InformationBanner { > + icon-size: $SIZE_ICON_LARGE $SIZE_ICON_LARGE; > + margin-right: 1mm; > + margin-top:1mm; > + margin-left:1mm; > + margin-bottom:1mm; > background-image: "meegotouch-notification-information-background" > 10px 10px 10px 10px; > } > > -MBannerStyle#InformationBanner:pressed { > +MBannerStyle #Information:pressed { > background-image: > "meegotouch-notification-information-background-pressed" 10px 10px 10px > 10px; > } > > -MBannerStyle#SystemBanner { > +MBannerStyle #InformationBanner.Landscape { > + maximum-size: 83.4mm 8mm; > + minimum-size: 46mm 8mm; > + preferred-size: 83.4mm -1; > +} > + > +MBannerStyle #InformationBanner.Portrait { > + maximum-size: 46.4mm 10.6mm; > + minimum-size: 46.4mm 8mm; > + preferred-size: 46.4mm -1; > +} > + > +#MBannerTitleInformation{ > + color:$COLOR_INVERTED_FOREGROUND; > + font: $FONT_DEFAULT; > + margin-left: $INDENT_DEFAULT; > + margin-right: $INDENT_DEFAULT; > +} > + > +#MBannerIconInformation{ > + margin-right: 0; > + margin-left: $INDENT_DEFAULT; > + margin-top: $INDENT_DEFAULT; > + margin-bottom: $INDENT_DEFAULT; > +} > + > +/*Generic MBanner it can contain anything*/ > + > +MBannerStyle #GenericBanner { > + icon-size: $SIZE_ICON_LARGE $SIZE_ICON_LARGE; > + margin-right: $MARGIN_LARGE; > + margin-top:$MARGIN_LARGE; > + margin-left:$MARGIN_LARGE; > + margin-bottom:$MARGIN_LARGE; > background-image: "meegotouch-notification-system-background" 10px > 10px 10px 10px; > } > > -MBannerStyle#SystemBanner:pressed { > +MBannerStyle #GenericBanner:pressed { > background-image: > "meegotouch-notification-system-background-pressed" 10px 10px 10px 10px; > } > + > +MBannerStyle #GenericBanner.Landscape { > + maximum-size: 83.4mm 10.6mm; > + minimum-size: 46.6mm 6.4mm; > + preferred-size: 83.4mm -1; > +} > + > +MBannerStyle #GenericBanner.Portrait { > + maximum-size: 46.4mm 10.6mm; > + minimum-size: 46.4mm 6.4mm; > + preferred-size: 46.4mm -1; > +} > + > +#MBannerTitleGeneric { > + color:$COLOR_INVERTED_FOREGROUND; > + font: $FONT_DEFAULT; > + margin-left: $INDENT_DEFAULT; > +} > + > +#MBannerSubTitleGeneric { > + color:$COLOR_INVERTED_FOREGROUND; > + font: $FONT_SMALL; > + margin-left: $INDENT_DEFAULT; > + margin-right: $INDENT_DEFAULT; > +} > + > +#MBannerIconGeneric { > + margin-right: 0; > + margin-left: $INDENT_DEFAULT; > + margin-top: $INDENT_DEFAULT; > + margin-bottom: $INDENT_DEFAULT; > +} > + > +#MBannerTimeStampGeneric{ > + color:$COLOR_INVERTED_FOREGROUND; > + font: $FONT_SMALL; > +} > --- base/meegotouch/libmeegotouchviews/style/mdialogstyle.css > +++ base/meegotouch/libmeegotouchviews/style/mdialogstyle.css > @@ -119,12 +119,6 @@ > maximum-size: -1 5.2mm; > } > > -#MDialogProgressIndicator { > - margin-left: $MARGIN_DOUBLE; > - margin-right: $MARGIN_XLARGE; > - margin-top: $MARGIN_LARGE; > -} > - > #MDialogButtonBox { > background-image: meegotouch-dialog-button-area-background 10px > 10px 10px 10px; > margin-left: 0; > @@ -139,76 +133,13 @@ > minimum-size: -1 $SIZE_BUTTON; > } > > +#MDialogProgressIndicator { > + maximum-size: 3.2mm 3.2mm; > + minimum-size: 3.2mm 3.2mm; > + preferred-size: 3.2mm 3.2mm; > > -/* Dialog buttons */ > -MButtonStyle[first].Landscape { > - margin-right: 0; > - background-image: > "meegotouch-button-dialog-background-horizontal-left" 12px 12px 12px 12px; > -} > -MButtonStyle[first].Landscape:pressed { > - background-image: > "meegotouch-button-dialog-background-pressed-horizontal-left" 12px 12px > 12px 12px; > -} > - > -MButtonStyle[middle].Landscape { > - margin-left: 0; > - margin-right: 0; > - background-image: > "meegotouch-button-dialog-background-horizontal-center" 12px 12px 12px > 12px; > -} > -MButtonStyle[middle].Landscape:pressed { > - background-image: > "meegotouch-button-dialog-background-pressed-horizontal-center" 12px 12px > 12px 12px; > -} > - > -MButtonStyle[last].Landscape { > - margin-left: 0; > - background-image: > "meegotouch-button-dialog-background-horizontal-right" 12px 12px 12px 12px; > -} > -MButtonStyle[last].Landscape:pressed { > - background-image: > "meegotouch-button-dialog-background-pressed-horizontal-right" 12px 12px > 12px 12px; > -} > - > -MButtonStyle[single].Landscape { > - preferred-size: -1 $SIZE_BUTTON; > - minimum-size: -1 $SIZE_BUTTON; > - maximum-size: -1 $SIZE_BUTTON; > - background-image: "meegotouch-button-dialog-background" 12px 12px > 12px 12px; > -} > -MButtonStyle[single].Landscape:pressed { > - background-image: "meegotouch-button-dialog-background-pressed" 12px > 12px 12px 12px; > -} > - > -MButtonStyle[first].Portrait { > - margin-bottom: 0; > - background-image: "meegotouch-button-dialog-background-vertical-top" > 12px 12px 12px 12px; > -} > -MButtonStyle[first].Portrait:pressed { > - background-image: > "meegotouch-button-dialog-background-pressed-vertical-top" 12px 12px 12px > 12px; > -} > - > -MButtonStyle[middle].Portrait { > - margin-top: 0; > - margin-bottom: 0; > - background-image: > "meegotouch-button-dialog-background-vertical-center" 12px 12px 12px 12px; > -} > -MButtonStyle[middle].Portrait:pressed { > - background-image: > "meegotouch-button-dialog-background-pressed-vertical-center" 12px 12px > 12px 12px; > -} > - > -MButtonStyle[last].Portrait { > - margin-top: 0; > - background-image: > "meegotouch-button-dialog-background-vertical-bottom" 12px 12px 12px 12px; > -} > -MButtonStyle[last].Portrait:pressed { > - background-image: > "meegotouch-button-dialog-background-pressed-vertical-bottom" 12px 12px > 12px 12px; > -} > - > -MButtonStyle[single].Portrait { > - preferred-size: -1 $SIZE_BUTTON; > - minimum-size: -1 $SIZE_BUTTON; > - maximum-size: -1 $SIZE_BUTTON; > - background-image: "meegotouch-button-dialog-background" 12px 12px > 12px 12px; > -} > -MButtonStyle[single].Portrait:pressed { > - background-image: "meegotouch-button-dialog-background-pressed" 12px > 12px 12px 12px; > + margin-top: $MARGIN_LARGE; > + bg-pixmap: "meegotouch-progressindicator-spinner-background" 32px > 32px; > + progress-pixmap: "meegotouch-progressindicator-spinner-progress" > 32px 32px; > } > > - > --- base/meegotouch/libmeegotouchviews/style/mlistitemstyle.css > +++ base/meegotouch/libmeegotouchviews/style/mlistitemstyle.css > @@ -31,3 +31,5 @@ > background-color: $COLOR_INVERTED_FOREGROUND; > background-opacity: 1.0; > } > + > + > --- base/meegotouch/libmeegotouchviews/style/mspinnerstyle.css > +++ base/meegotouch/libmeegotouchviews/style/mspinnerstyle.css > @@ -47,19 +47,4 @@ > maximum-size: $SIZE_SPINNER_SMALL $SIZE_SPINNER_SMALL; > } > > -/* MDialog MSpinnerStyle doesnt work */ > -#MDialogProgressIndicator { > - bg-pixmap: "meegotouch-progressindicator-spinner-background" > $SIZE_SPINNER_DIALOG $SIZE_SPINNER_DIALOG; > - progress-pixmap: "meegotouch-progressindicator-spinner-progress" > $SIZE_SPINNER_DIALOG $SIZE_SPINNER_DIALOG; > - > - minimum-size: $SIZE_SPINNER_DIALOG $SIZE_SPINNER_DIALOG; > - preferred-size: $SIZE_SPINNER_DIALOG $SIZE_SPINNER_DIALOG; > - maximum-size: $SIZE_SPINNER_DIALOG $SIZE_SPINNER_DIALOG; > - > - margin-left: $MARGIN_MEDIUM; > - margin-top: $MARGIN_MEDIUM; > - margin-right: $MARGIN_MEDIUM; > - margin-bottom: $MARGIN_MEDIUM; > -} > - > > --- debian/changelog > +++ debian/changelog > @@ -1,3 +1,17 @@ > +meegotouchtheme (0.20.51-1) unstable; urgency=low > + > + * New version > + * Changes: Updated commonuicontrolstyle.css > + * Changes: Updated commonbuttonstyle.css > + * Changes: Updated commonpanelstyle.css > + * Changes: Updated commonlayoutstyle.css > + * Changes: Updated commoniconstyle.css > + * Changes: Adding new buttonstyles from toolki 1.5.4 to > commonbuttonstyles.css > + * Changes: adapting dialogs to the new layouts > + * Mbanner: new layouts > + > + -- Adrian Yanes <[email protected]> Thu, 28 Oct 2010 12:30:56 > +0300 > + > meegotouchtheme (0.20.50-1) unstable; urgency=low > > * New version > > ++++++ meegotouch-theme.yaml > --- meegotouch-theme.yaml > +++ meegotouch-theme.yaml > @@ -1,6 +1,6 @@ > Name: meegotouch-theme > Summary: Theme for Meego Touch based applications > -Version: 0.20.50 > +Version: 0.20.51 > Release: 1 > Group: System/Desktop > License: LGPLv2.1 > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
