Peter M. Groen / dali-demo

Commit f531d16a6c051b178b769d636e17b5be87014c07

Authored by David Steele
Committed by David Steele
1 parent 059291c2

Fixed up styling following toolkit string comparison 

Fixed style paths in build system for images
Changed style names in style sheets to use CamelCase for readability.

Change-Id: I094af8d27e7a8af23555a63e7b76df3e9e1993ec
Signed-off-by: David Steele <david.steele@samsung.com>
Inline Side-by-side
Showing 13 changed files with 83 additions and 82 deletions
build/tizen/CMakeLists.txt
  View file @f531d16
... ... @@ -56,7 +56,7 @@ SET(DEMO_EXAMPLE_BIN \\&quot;${BINDIR}/\\&quot;)
56 56 SET(DEMO_LOCALE_DIR \\"${LOCALE_DIR}\\")
57 57 SET(DEMO_LANG \\"${LANG}\\")
58 58  
59   -SET(DEMO_STYLE_IMAGE_DIR ${STYLE_DIR}images)
  59 +SET(DEMO_STYLE_IMAGE_DIR ${STYLE_DIR}/images)
60 60  
61 61 FILE(GLOB LOCAL_IMAGES_PNG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.png")
62 62 FILE(GLOB LOCAL_IMAGES_JPG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.jpg")
... ...
demo/dali-table-view.cpp
  View file @f531d16
... ... @@ -90,7 +90,7 @@ Control CreateBackground( std::string stylename )
90 90 {
91 91 Control background = Control::New();
92 92 Stage::GetCurrent().Add( background );
93   - background.SetProperty( Control::Property::STYLE_NAME,stylename);
  93 + background.SetStyleName( stylename);
94 94 background.SetName( "BACKGROUND" );
95 95 background.SetAnchorPoint( AnchorPoint::CENTER );
96 96 background.SetParentOrigin( ParentOrigin::CENTER );
... ... @@ -185,7 +185,7 @@ void DaliTableView::Initialize( Application&amp; application )
185 185 const Vector2 stageSize = Stage::GetCurrent().GetSize();
186 186  
187 187 // Background
188   - Control background = CreateBackground( "launcherbackground" );
  188 + Control background = CreateBackground( "LauncherBackground" );
189 189 Stage::GetCurrent().Add( background );
190 190  
191 191 // Add root actor
... ... @@ -464,7 +464,7 @@ Actor DaliTableView::CreateTile( const std::string&amp; name, const std::string&amp; tit
464 464  
465 465 TextLabel label = TextLabel::New();
466 466 label.SetAnchorPoint( AnchorPoint::TOP_LEFT );
467   - label.SetProperty( Control::Property::STYLE_NAME, "launcherlabel" );
  467 + label.SetStyleName( "LauncherLabel" );
468 468 label.SetProperty( TextLabel::Property::MULTI_LINE, true );
469 469 label.SetProperty( TextLabel::Property::TEXT, title );
470 470 label.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
... ...
examples/builder/examples.cpp
  View file @f531d16
... ... @@ -387,7 +387,7 @@ public:
387 387 Actor MenuItem(const std::string& text)
388 388 {
389 389 TextLabel label = TextLabel::New( ShortName( text ) );
390   - label.SetProperty( Dali::Toolkit::Control::Property::STYLE_NAME, "builderlabel" );
  390 + label.SetStyleName( "BuilderLabel" );
391 391 label.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
392 392  
393 393 // Hook up tap detector
... ...
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @f531d16
... ... @@ -45,9 +45,8 @@ const char* const SAMPLING_BUTTON_ID = &quot;SAMPLING_BUTTON&quot;;
45 45 const char* const FITTING_BUTTON_TEXT = "Fitting";
46 46 const char* const SAMPLING_BUTTON_TEXT = "Sampling";
47 47  
48   -const char* const STYLE_LABEL_TEXT = "grouplabel";
49   -const char* const STYLE_BUTTON_TEXT = "buttonlabel";
50   -
  48 +const char* const STYLE_LABEL_TEXT = "ImageScalingGroupLabel";
  49 +const char* const STYLE_BUTTON_TEXT = "ImageScalingButton";
51 50  
52 51 const char* IMAGE_PATHS[] =
53 52 {
... ... @@ -336,7 +335,7 @@ public:
336 335 fittingModeGroup.SetFitHeight( 1 );
337 336  
338 337 TextLabel label = TextLabel::New( "Image fitting mode:" );
339   - label.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_LABEL_TEXT );
  338 + label.SetStyleName( STYLE_LABEL_TEXT );
340 339 fittingModeGroup.Add( label );
341 340  
342 341 Toolkit::PushButton button = CreateButton( FITTING_BUTTON_ID, StringFromScalingMode( mFittingMode ) );
... ... @@ -357,7 +356,7 @@ public:
357 356 samplingModeGroup.SetFitHeight( 1 );
358 357  
359 358 TextLabel label = TextLabel::New( "Image sampling mode:" );
360   - label.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_LABEL_TEXT );
  359 + label.SetStyleName( STYLE_LABEL_TEXT );
361 360 samplingModeGroup.Add( label );
362 361  
363 362 Toolkit::PushButton button = CreateButton( SAMPLING_BUTTON_ID, StringFromFilterMode( mSamplingMode ) );
... ... @@ -371,7 +370,7 @@ public:
371 370 Toolkit::PushButton CreateButton( const char * id, const char * label )
372 371 {
373 372 Toolkit::PushButton button = Toolkit::PushButton::New();
374   - button.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT );
  373 + button.SetStyleName( STYLE_BUTTON_TEXT );
375 374 button.SetName( id );
376 375 button.SetLabelText( label );
377 376 button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
... ...
examples/styling/styling-application.cpp
  View file @f531d16
... ... @@ -135,7 +135,7 @@ void StylingApplication::Create( Application&amp; application )
135 135  
136 136 mTitle = TextLabel::New( "Styling Example" );
137 137 mTitle.SetName( "Title" );
138   - mTitle.SetStyleName("title");
  138 + mTitle.SetStyleName("Title");
139 139 mTitle.SetAnchorPoint( AnchorPoint::TOP_CENTER );
140 140 mTitle.SetParentOrigin( ParentOrigin::TOP_CENTER );
141 141 mTitle.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
... ... @@ -246,7 +246,7 @@ void StylingApplication::Create( Application&amp; application )
246 246 channelSliderLayout.SetCellAlignment( TableView::CellPosition( i, 0 ), HorizontalAlignment::CENTER, VerticalAlignment::CENTER );
247 247  
248 248 TextLabel label = TextLabel::New( checkboxLabels[i] );
249   - std::ostringstream labelStyleName; labelStyleName << "colorLabel" << i+1;
  249 + std::ostringstream labelStyleName; labelStyleName << "ColorLabel" << i+1;
250 250 label.SetName( labelStyleName.str() );
251 251 label.SetStyleName( labelStyleName.str() );
252 252 label.SetParentOrigin( ParentOrigin::CENTER );
... ... @@ -258,7 +258,7 @@ void StylingApplication::Create( Application&amp; application )
258 258 channelSliderLayout.SetCellAlignment( TableView::CellPosition( i, 1 ), HorizontalAlignment::CENTER, VerticalAlignment::CENTER );
259 259  
260 260 mChannelSliders[i] = Slider::New();
261   - std::ostringstream sliderStyleName; sliderStyleName << "colorSlider" << i+1;
  261 + std::ostringstream sliderStyleName; sliderStyleName << "ColorSlider" << i+1;
262 262 mChannelSliders[i].SetName( sliderStyleName.str() );
263 263 mChannelSliders[i].SetStyleName( sliderStyleName.str() );
264 264 mChannelSliders[i].SetParentOrigin( ParentOrigin::CENTER );
... ... @@ -302,7 +302,7 @@ void StylingApplication::Create( Application&amp; application )
302 302  
303 303 TextLabel label = TextLabel::New( "Theme: ");
304 304 label.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
305   - label.SetStyleName("themelabel");
  305 + label.SetStyleName("ThemeLabel");
306 306 label.SetAnchorPoint( AnchorPoint::TOP_CENTER );
307 307 label.SetParentOrigin( ParentOrigin::TOP_CENTER );
308 308 themeButtonLayout.AddChild( label, TableView::CellPosition( 0, 0 ) );
... ... @@ -386,7 +386,7 @@ Popup StylingApplication::CreateResetPopup()
386 386  
387 387 TextLabel text = TextLabel::New( "This will reset the channel data to full value. Are you sure?" );
388 388 text.SetName( "PopupContentText" );
389   - text.SetStyleName( "popupBody" );
  389 + text.SetStyleName( "PopupBody" );
390 390 text.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
391 391 text.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT );
392 392 text.SetProperty( TextLabel::Property::MULTI_LINE, true );
... ... @@ -442,7 +442,7 @@ TextLabel StylingApplication::CreateTitle( std::string title )
442 442 {
443 443 TextLabel titleActor = TextLabel::New( title );
444 444 titleActor.SetName( "titleActor" );
445   - titleActor.SetStyleName( "popupTitle" );
  445 + titleActor.SetStyleName( "PopupTitle" );
446 446 titleActor.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
447 447 titleActor.SetProperty( TextLabel::Property::MULTI_LINE, false );
448 448  
... ...
examples/text-fonts/text-fonts-example.cpp
  View file @f531d16
... ... @@ -185,7 +185,7 @@ public:
185 185 CreateTextLabel ( mLabel, LABEL_TEXT, Color::WHITE );
186 186  
187 187 CreateTextLabel ( mLabel2, LABEL_TEXT, Color::WHITE );
188   - mLabel2.SetStyleName("textlabel-Rosemary");
  188 + mLabel2.SetStyleName("TextLabelRosemary");
189 189  
190 190 CreateTextLabel ( mLabel3, LABEL_TEXT, Color::WHITE );
191 191 mLabel3.SetProperty( TextLabel::Property::FONT_FAMILY, "SamsungOneUI" );
... ...
resources/style/demo-theme.json.in
  View file @f531d16
... ... @@ -17,50 +17,52 @@
17 17 {
18 18 "styles":
19 19 {
20   - "confirmationpopup":{
  20 + "ConfirmationPopup":{
21 21 "popupBackgroundImage":"{APPLICATION_RESOURCE_PATH}/images/00_popup_bg.9.png"
22 22 },
23 23  
24   - "textlabel-Rosemary":
  24 + "TextLabelRosemary":
25 25 {
26 26 "fontFamily":"Rosemary"
27 27 },
28   - "textlabel":
  28 + "TextLabel":
29 29 {
30 30 "fontStyle":"Regular",
31 31 "pointSize":18
32 32 },
33   - "launcherlabel":
  33 + "LauncherLabel":
34 34 {
35 35 "pointSize":18
36 36 },
37 37  
38   - "toolbarlabel":
  38 + "ToolbarLabel":
39 39 {
40 40 "pointSize":18
41 41 },
42 42  
43   - "builderlabel":
  43 + "BuilderLabel":
44 44 {
45 45 "pointSize":13
46 46 },
47 47  
48   - "scrollview":
  48 + "ScrollView":
49 49 {
50 50 "overshootEffectColor":"B018"
51 51 },
52 52  
53   - "grouplabel":
  53 + "ImageScalingGroupLabel":
54 54 {
55 55 "pointSize":9
56 56 },
57 57  
58   - "buttonlabel":
  58 + "ImageScalingButton":
59 59 {
60   - "pointSize":11
  60 + "label":{
  61 + "pointSize":11
  62 + }
61 63 },
62 64  
63   - "launcherbackground":
  65 + "LauncherBackground":
64 66 {
65 67 "background":
66 68 {
... ...
resources/style/images/00_popup_bg.9.png 0 → 100644
View file @f531d16

1.52 KB
resources/style/mobile/demo-theme.json.in
  View file @f531d16
... ... @@ -18,67 +18,67 @@
18 18 {
19 19 "styles":
20 20 {
21   - "textlabel-Rosemary":
  21 + "TextLabelRosemary":
22 22 {
23 23 "fontFamily":"Rosemary"
24 24 },
25   - "textlabel":
  25 + "TextLabel":
26 26 {
27 27 "fontStyle":"Regular",
28 28 "pointSize":18
29 29 },
30   - "textlabelFontSize0":
  30 + "TextLabelFontSize0":
31 31 {
32 32 "pointSize":8
33 33 },
34   - "textlabelFontSize1":
  34 + "TextLabelFontSize1":
35 35 {
36 36 "pointSize":10
37 37 },
38   - "textlabelFontSize2":
  38 + "TextLabelFontSize2":
39 39 {
40 40 "pointSize":15
41 41 },
42   - "textlabelFontSize3":
  42 + "TextLabelFontSize3":
43 43 {
44 44 "pointSize":19
45 45 },
46   - "textlabelFontSize4":
  46 + "TextLabelFontSize4":
47 47 {
48 48 "pointSize":25
49 49 },
50 50  
51   - "launcherlabel":
  51 + "Launcherlabel":
52 52 {
53 53 "pointSize":8
54 54 },
55 55  
56   - "toolbarlabel":
  56 + "ToolbarLabel":
57 57 {
58 58 "pointSize":10
59 59 },
60 60  
61   - "builderlabel":
  61 + "BuilderLabel":
62 62 {
63 63 "pointSize":10
64 64 },
65 65  
66   - "scrollview":
  66 + "ScrollView":
67 67 {
68 68 "overshootEffectColor":"B018"
69 69 },
70 70  
71   - "grouplabel":
  71 + "GroupLabel":
72 72 {
73 73 "pointSize":6
74 74 },
75 75  
76   - "buttonlabel":
  76 + "ButtonLabel":
77 77 {
78 78 "pointSize":8
79 79 },
80 80  
81   - "launcherbackground":
  81 + "LauncherBackground":
82 82 {
83 83 "background":
84 84 {
... ...
resources/style/style-example-theme-one.json.in
  View file @f531d16
1 1 {
2 2 "styles":
3 3 {
4   - "title":{
  4 + "Title":{
5 5 "textColor":"#0000ff",
6 6 "background":
7 7 {
... ... @@ -9,58 +9,58 @@
9 9 "mixColor": [ 1.0, 1.0, 1.0, 1.0 ]
10 10 }
11 11 },
12   - "tableview":{
  12 + "TableView":{
13 13 "background":
14 14 {
15 15 "visualType":"COLOR",
16 16 "mixColor": [ 1.0, 1.0, 1.0, 0.03 ]
17 17 }
18 18 },
19   - "flexcontainer":{
  19 + "FlexContainer":{
20 20 "background":
21 21 {
22 22 "visualType":"COLOR",
23 23 "mixColor": [ 1.0, 1.0, 1.0, 0.1 ]
24 24 }
25 25 },
26   - "radiobutton":{
  26 + "RadioButton":{
27 27 "label":{
28 28 "textColor": [1,1,1,1]
29 29 }
30 30 },
31   - "checkboxbutton":{
  31 + "CheckBoxButton":{
32 32 "label":{
33 33 "textColor": [1,1,1,1]
34 34 }
35 35 },
36   - "colorLabel1":{
  36 + "ColorLabel1":{
37 37 "textColor": [1,0,0,1]
38 38 },
39   - "colorLabel2":{
  39 + "ColorLabel2":{
40 40 "textColor": [0,1,0,1]
41 41 },
42   - "colorLabel3":{
  42 + "ColorLabel3":{
43 43 "textColor": [0.3,0.3,1,1]
44 44 },
45   - "themelabel":{
  45 + "ThemeLabel":{
46 46 "textColor":[0,1,1,1]
47 47 },
48   - "popupTitle":{
  48 + "PopupTitle":{
49 49 "textColor":[1,1,1,1]
50 50 },
51   - "popupBody":{
  51 + "PopupBody":{
52 52 "textColor":[1,1,0,1]
53 53 },
54   - "textlabel":{
  54 + "TextLabel":{
55 55 "textColor":[0,0,0,1]
56 56 },
57   - "colorSlider1":{
58   - "styles":["slider"]
  57 + "ColorSlider1":{
  58 + "styles":["Slider"]
59 59 },
60   - "colorSlider2":{
  60 + "ColorSlider2":{
61 61 "styles":["slider"]
62 62 },
63   - "colorSlider3":{
  63 + "ColorSlider3":{
64 64 "styles":["slider"]
65 65 }
66 66 }
... ...
resources/style/style-example-theme-three.json.in
  View file @f531d16
1 1 {
2 2 "styles":
3 3 {
4   - "title":{
  4 + "Title":{
5 5 "textColor":"#0000ff",
6 6 "background":
7 7 {
... ... @@ -9,42 +9,42 @@
9 9 "mixColor": [ 1.0, 1.0, 1.0, 1.0 ]
10 10 }
11 11 },
12   - "tableview":{
  12 + "TableView":{
13 13 "background":
14 14 {
15 15 "visualType":"COLOR",
16 16 "mixColor": [ 1.0, 1.0, 1.0, 0.03 ]
17 17 }
18 18 },
19   - "radiobutton":{
  19 + "RadioButton":{
20 20 "label":{
21 21 "textColor": [1,1,1,1]
22 22 }
23 23 },
24   - "checkboxbutton":{
  24 + "CheckboxButton":{
25 25 "label":{
26 26 "textColor": [1,1,1,1]
27 27 }
28 28 },
29   - "colorLabel1":{
  29 + "ColorLabel1":{
30 30 "textColor": [1,0,0,1]
31 31 },
32   - "colorLabel2":{
  32 + "ColorLabel2":{
33 33 "textColor": [0,1,0,1]
34 34 },
35   - "colorLabel3":{
  35 + "ColorLabel3":{
36 36 "textColor": [0.3,0.3,1,1]
37 37 },
38   - "themelabel":{
  38 + "ThemeLabel":{
39 39 "textColor":[0,1,1,1]
40 40 },
41   - "popupTitle":{
  41 + "PopupTitle":{
42 42 "textColor":[1,1,1,1]
43 43 },
44   - "popupBody":{
  44 + "PopupBody":{
45 45 "textColor":[1,1,0,1]
46 46 },
47   - "textlabel":{
  47 + "TextLabel":{
48 48 "textColor":[0,0,0,1]
49 49 }
50 50 }
... ...
resources/style/style-example-theme-two.json.in
  View file @f531d16
... ... @@ -5,7 +5,7 @@
5 5 },
6 6 "styles":
7 7 {
8   - "title":{
  8 + "Title":{
9 9 "textColor":"#0000ff",
10 10 "background":
11 11 {
... ... @@ -13,7 +13,7 @@
13 13 "mixColor": [ 1.0, 1.0, 1.0, 1.0 ]
14 14 }
15 15 },
16   - "tableview":{
  16 + "TableView":{
17 17 "background":
18 18 {
19 19 "visualType":"GRADIENT",
... ... @@ -24,7 +24,7 @@
24 24 },
25 25  
26 26 // Change an icon size, see if it gets properly re-sized
27   - "radiobutton":{
  27 + "RadioButton":{
28 28 "unselectedStateImage":"{STYLE_DIR}/images/radio-button-unselected.png",
29 29 "selectedStateImage":"{STYLE_DIR}/images/radio-button-selected.png",
30 30 "disabledStateImage":"{STYLE_DIR}/images/radio-button-unselected-disabled.png",
... ... @@ -58,11 +58,11 @@
58 58 },
59 59  
60 60 // Note, this overrides any non-renamed label styles, e.g. those in a button.
61   - "textlabel":{
  61 + "TextLabel":{
62 62 //"textColor":[0,0,0,1]
63 63 },
64 64  
65   - "thinslider":{
  65 + "ThinSlider":{
66 66 "styles": ["slider"],
67 67 "showPopup":true,
68 68 "showValue":false,
... ... @@ -75,19 +75,19 @@
75 75 },
76 76 "enabled":true
77 77 },
78   - "colorSlider1":{
79   - "styles":["thinslider"],
  78 + "ColorSlider1":{
  79 + "styles":["ThinSlider"],
80 80 "progressVisual":{
81 81 "url":"{STYLE_DIR}/images/slider-skin-progress-red.9.png"
82 82 }
83 83 },
84   - "colorSlider2":{
85   - "styles":["thinslider"],
  84 + "ColorSlider2":{
  85 + "styles":["ThinSlider"],
86 86 "progressVisual":{
87 87 "url":"{STYLE_DIR}/images/slider-skin-progress-green.9.png"
88 88 }
89 89 },
90   - "colorSlider3":{
  90 + "ColorSlider3":{
91 91 "styles":["thinslider"],
92 92 "progressVisual":{
93 93 "url":"{STYLE_DIR}/images/slider-skin-progress-blue.9.png"
... ...
shared/view.h
  View file @f531d16
... ... @@ -94,7 +94,7 @@ Dali::Layer CreateToolbar( Dali::Toolkit::ToolBar&amp; toolBar,
94 94 {
95 95 Dali::Toolkit::TextLabel label = Dali::Toolkit::TextLabel::New();
96 96 label.SetAnchorPoint( Dali::AnchorPoint::TOP_LEFT );
97   - label.SetProperty( Dali::Toolkit::Control::Property::STYLE_NAME, "toolbarlabel" );
  97 + label.SetStyleName( "ToolbarLabel" );
98 98 label.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT, title );
99 99 label.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
100 100 label.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
... ... @@ -168,7 +168,7 @@ Dali::Layer CreateView( Dali::Application&amp; application,
168 168 Dali::Toolkit::TextLabel CreateToolBarLabel( const std::string& text )
169 169 {
170 170 Dali::Toolkit::TextLabel label = Dali::Toolkit::TextLabel::New( text );
171   - label.SetProperty( Dali::Toolkit::Control::Property::STYLE_NAME, "toolbarlabel" );
  171 + label.SetStyleName( "ToolbarLabel" );
172 172 label.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
173 173 label.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
174 174 label.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::HEIGHT );
... ...