equal
deleted
inserted
replaced
16 * |
16 * |
17 */ |
17 */ |
18 |
18 |
19 |
19 |
20 //INCLUDES |
20 //INCLUDES |
|
21 #include <hbaction.h> |
|
22 #include <hbtextitem.h> |
|
23 #include <centralrepository.h> |
21 |
24 |
22 #include "iaupdateagreement.h" |
25 #include "iaupdateagreement.h" |
23 #include "iaupdatefirsttimeinfo.h" |
26 #include "iaupdatefirsttimeinfo.h" |
24 #include "iaupdatedialogutil.h" |
|
25 #include "iaupdate.hrh" |
27 #include "iaupdate.hrh" |
26 #include "iaupdateprivatecrkeys.h" |
28 #include "iaupdateprivatecrkeys.h" |
27 |
29 |
28 #include <avkon.rsg> |
|
29 #include <iaupdate.rsg> |
|
30 #include <aknmessagequerydialog.h> // CAknMessageQueryDialog |
|
31 #include <StringLoader.h> |
|
32 #include <AknUtils.h> |
|
33 |
30 |
34 // ================= MEMBER FUNCTIONS ======================= |
31 // ================= MEMBER FUNCTIONS ======================= |
35 |
32 |
36 // --------------------------------------------------------------------------- |
33 // --------------------------------------------------------------------------- |
37 // CIAUpdateAgreement::NewL |
34 // CIAUpdateAgreement::NewL |
108 autoUpdateCheckValue == EIAUpdateSettingValueEnable ) |
105 autoUpdateCheckValue == EIAUpdateSettingValueEnable ) |
109 { |
106 { |
110 accepted = ETrue; |
107 accepted = ETrue; |
111 firstTimeInfo->SetAgreementAcceptedL(); |
108 firstTimeInfo->SetAgreementAcceptedL(); |
112 } |
109 } |
113 else if ( ShowDialogL( R_IAUPDATE_SOFTKEYS_ACCEPT_DECLINE__ACCEPT ) == EAknSoftkeyYes ) |
|
114 { |
|
115 accepted = ETrue; |
|
116 firstTimeInfo->SetAgreementAcceptedL(); |
|
117 } |
|
118 } |
110 } |
119 CleanupStack::PopAndDestroy( firstTimeInfo ); |
111 CleanupStack::PopAndDestroy( firstTimeInfo ); |
120 return accepted; |
112 return accepted; |
121 } |
113 } |
122 |
114 |
131 firstTimeInfo->SetAgreementAcceptedL(); |
123 firstTimeInfo->SetAgreementAcceptedL(); |
132 CleanupStack::PopAndDestroy( firstTimeInfo ); |
124 CleanupStack::PopAndDestroy( firstTimeInfo ); |
133 } |
125 } |
134 |
126 |
135 |
127 |
136 |
|
137 |
|
138 |
|
139 // --------------------------------------------------------------------------- |
|
140 // CIAUpdateAgreement::ShowAgreementL |
|
141 // |
|
142 // --------------------------------------------------------------------------- |
|
143 // |
|
144 void CIAUpdateAgreement::ShowAgreementL() |
|
145 { |
|
146 ShowDialogL( R_AVKON_SOFTKEYS_OK_EMPTY ); |
|
147 } |
|
148 |
128 |
149 // --------------------------------------------------------------------------- |
129 // --------------------------------------------------------------------------- |
150 // CIAUpdateAgreement::AgreementAcceptedL |
130 // CIAUpdateAgreement::AgreementAcceptedL |
151 // |
131 // |
152 // --------------------------------------------------------------------------- |
132 // --------------------------------------------------------------------------- |
157 TBool ret = firstTimeInfo->AgreementAcceptedL(); |
137 TBool ret = firstTimeInfo->AgreementAcceptedL(); |
158 CleanupStack::PopAndDestroy( firstTimeInfo ); |
138 CleanupStack::PopAndDestroy( firstTimeInfo ); |
159 return ret; |
139 return ret; |
160 } |
140 } |
161 |
141 |
162 // --------------------------------------------------------------------------- |
142 |
163 // CIAUpdateAgreement::ShowDialogL |
143 |
164 // |
144 /*HBufC* text_1 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_1 ); |
165 // --------------------------------------------------------------------------- |
|
166 // |
|
167 TInt CIAUpdateAgreement::ShowDialogL( TInt aCbaResourceId ) |
|
168 { |
|
169 HBufC* text_1 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_1 ); |
|
170 HBufC* text_2 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_2 ); |
145 HBufC* text_2 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_2 ); |
171 HBufC* text_3 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_3 ); |
146 HBufC* text_3 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_3 ); |
172 HBufC* text_4 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_4 ); |
147 HBufC* text_4 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_4 ); |
173 HBufC* text_5 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_5 ); |
148 HBufC* text_5 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_5 ); |
174 HBufC* text_6 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_6 ); |
149 HBufC* text_6 = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_TEXT_6 ); |
178 CArrayFix<TInt>* numberArray = |
153 CArrayFix<TInt>* numberArray = |
179 new ( ELeave ) CArrayFixFlat<TInt>( 2 ); |
154 new ( ELeave ) CArrayFixFlat<TInt>( 2 ); |
180 CleanupStack::PushL( numberArray ); |
155 CleanupStack::PushL( numberArray ); |
181 numberArray->AppendL( 2007 ); |
156 numberArray->AppendL( 2007 ); |
182 numberArray->AppendL( 2009 ); |
157 numberArray->AppendL( 2009 ); |
183 HBufC* text_copyright = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_COPYRIGHT, *numberArray ); |
158 //HBufC* text_copyright = StringLoader::LoadLC( R_IAUPDATE_AGREEMENT_DIALOG_COPYRIGHT, *numberArray ); |
184 TPtr ptr = text_copyright->Des(); |
159 TPtr ptr = text_copyright->Des(); |
185 AknTextUtils::DisplayTextLanguageSpecificNumberConversion( ptr ); |
160 AknTextUtils::DisplayTextLanguageSpecificNumberConversion( ptr ); |
186 |
161 |
187 HBufC* text = HBufC::NewLC( text_1->Length() + |
162 HBufC* text = HBufC::NewLC( text_1->Length() + |
188 text_2->Length() + |
163 text_2->Length() + |
228 |
203 |
229 dlg->ButtonGroupContainer().SetCommandSetL( aCbaResourceId ); |
204 dlg->ButtonGroupContainer().SetCommandSetL( aCbaResourceId ); |
230 |
205 |
231 TInt ret = dlg->RunLD(); |
206 TInt ret = dlg->RunLD(); |
232 |
207 |
233 return ret; |
208 return ret;*/ |
234 } |
209 //return KErrNone; |
|
210 |
235 |
211 |
236 // End of File |
212 // End of File |