equal
deleted
inserted
replaced
25 |
25 |
26 //User Includes |
26 //User Includes |
27 #include "glxuistd.h" |
27 #include "glxuistd.h" |
28 #include "glxviewids.h" |
28 #include "glxviewids.h" |
29 #include "glxslideshowsettingsview.h" |
29 #include "glxslideshowsettingsview.h" |
30 #include "glxmodelparm.h" |
30 #include "glxeffectengine.h" |
31 |
31 |
32 |
32 |
33 |
33 |
34 |
34 |
35 GlxSlideShowSettingsView::GlxSlideShowSettingsView(HbMainWindow *window) |
35 GlxSlideShowSettingsView::GlxSlideShowSettingsView(HbMainWindow *window) |
36 : GlxView ( GLX_SLIDESHOWSETTINGSVIEW_ID ), |
36 : GlxView ( GLX_SLIDESHOWSETTINGSVIEW_ID ), |
|
37 mEffect(NULL), |
37 mDelay(NULL), |
38 mDelay(NULL), |
38 mEffect(NULL), |
39 mWindow(window), |
39 mContextlabel (NULL), |
40 mContextlabel (NULL), |
40 mEffectlabel (NULL), |
41 mEffectlabel (NULL), |
41 mDelaylabel (NULL), |
42 mDelaylabel (NULL), |
42 mWindow(window) |
43 mSettings( NULL ) |
43 { |
44 { |
44 mTempEffect = 0; |
45 mSettings = new GlxSlideShowSetting(); |
45 mTempDelay =0 ; |
|
46 setContentFullScreen( true ); |
46 setContentFullScreen( true ); |
47 } |
47 } |
48 |
48 |
49 GlxSlideShowSettingsView::~GlxSlideShowSettingsView() |
49 GlxSlideShowSettingsView::~GlxSlideShowSettingsView() |
50 { |
50 { |
51 if(mContextlabel) { |
|
52 delete mContextlabel; |
51 delete mContextlabel; |
53 mContextlabel = NULL; |
|
54 } |
|
55 if(mEffectlabel) { |
|
56 delete mEffectlabel; |
52 delete mEffectlabel; |
57 mEffectlabel = NULL; |
|
58 } |
|
59 if(mDelaylabel) { |
|
60 delete mDelaylabel; |
53 delete mDelaylabel; |
61 mDelaylabel = NULL; |
|
62 } |
|
63 if(mEffect) { |
|
64 delete mEffect; |
54 delete mEffect; |
65 mEffect = NULL; |
|
66 } |
|
67 if(mDelay) { |
|
68 delete mDelay; |
55 delete mDelay; |
69 mDelay = NULL; |
56 delete mSettings; |
70 } |
|
71 } |
57 } |
72 |
58 |
73 void GlxSlideShowSettingsView::setModel(QAbstractItemModel *model) |
59 void GlxSlideShowSettingsView::setModel(QAbstractItemModel *model) |
74 { |
60 { |
75 return; |
61 return; |
92 mEffectlabel = new HbLabel("Transition effect:", this); |
78 mEffectlabel = new HbLabel("Transition effect:", this); |
93 } |
79 } |
94 |
80 |
95 if ( mEffect == NULL ) { |
81 if ( mEffect == NULL ) { |
96 mEffect = new HbComboBox(this); |
82 mEffect = new HbComboBox(this); |
97 QStringList effectList; |
83 QStringList effectList = mSettings->slideShowEffectList(); |
98 effectList<<"wave"<<"smooth fade"<<"zoom to face"; |
|
99 mEffect->addItems( effectList ); |
84 mEffect->addItems( effectList ); |
100 |
85 |
101 } |
86 } |
102 |
87 |
103 if ( mDelaylabel == NULL ) { |
88 if ( mDelaylabel == NULL ) { |
109 QStringList delayList; |
94 QStringList delayList; |
110 delayList<<"slow"<<"medium"<<"fast"; |
95 delayList<<"slow"<<"medium"<<"fast"; |
111 mDelay->addItems( delayList ); |
96 mDelay->addItems( delayList ); |
112 } |
97 } |
113 |
98 |
114 mEffect->setCurrentIndex( mTempEffect); |
99 // Read the values from the cenrep |
115 mDelay->setCurrentIndex ( mTempDelay ); |
|
116 |
100 |
|
101 mEffect->setCurrentIndex( mSettings->slideShowEffectIndex()); |
|
102 mDelay->setCurrentIndex( mSettings->slideShowDelayIndex()); |
117 setLayout(); |
103 setLayout(); |
118 } |
104 } |
119 |
105 |
120 void GlxSlideShowSettingsView::setLayout() |
106 void GlxSlideShowSettingsView::setLayout() |
121 { |
107 { |
129 } |
115 } |
130 |
116 |
131 void GlxSlideShowSettingsView::deActivate() |
117 void GlxSlideShowSettingsView::deActivate() |
132 { |
118 { |
133 //Store the current effect and delay before going back to the previous view |
119 //Store the current effect and delay before going back to the previous view |
134 mTempEffect = mEffect->currentIndex(); |
120 mSettings->setslideShowEffectIndex(mEffect->currentIndex()); |
135 mTempDelay = mDelay->currentIndex(); |
121 mSettings->setSlideShowDelayIndex(mDelay->currentIndex()); |
136 disconnect(mWindow, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(orientationChanged(Qt::Orientation))); |
122 disconnect(mWindow, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(orientationChanged(Qt::Orientation))); |
137 } |
123 } |
138 |
124 |
139 |
125 |
140 |
126 |