← Back to branch summary

~klimczak-k/beaver-feeds/server

« back to all changes in this revision

Viewing changes to settings/networksd.cpp

  • Committer: Krzysztof Klimczak
  • Date: 2011-01-31 05:44:57 UTC
  • Revision ID: klimczak.k@gmail.com-20110131054457-39goidzjg9qs26u2
*keys and default values of setting now stored in one place
*moved starting listening and connecting to db from main.cpp to MyApp

*testing connection with RSS channel

Show diffs side-by-side

added added

removed removed

Lines of Context:
settings/networksd.cpp
93
93
        d->m_pListeningPort = new QSpinBox( box );
94
94
        d->m_pListeningPort->setRange(0, 65535);
95
95
        d->m_pListeningPort->setValue(
96
 
                        Core::instance()->settings()->value( "general/network/incomingPort",
97
 
                                                                                                 QVariant(443) )
 
96
                        Core::instance()->settings()->value( Setting::incomingPortKey,
 
97
                                                                                                 Setting::incomingPortDef )
98
98
                        .toInt() );
99
 
        d->m_pListeningPort->setToolTip( tr("Domyślny port: 443") );
 
99
        d->m_pListeningPort->setToolTip( tr("Domyślny port: %1")
 
100
                                                                         .arg(Setting::incomingPortDef.toInt()) );
100
101
        connect( d->m_pListeningPort, SIGNAL(valueChanged(int)),
101
102
                         this, SLOT(spinboxChanged(int)) );
102
103
 
112
113
 
113
114
        d->m_pServerKey = new OpenLineEdit( box2 );
114
115
        d->m_pServerKey->setText(
115
 
                        Core::instance()->settings()->value( "general/network/SSLKey",
116
 
                                                                                                 QVariant() )
 
116
                        Core::instance()->settings()->value( Setting::SSLKeyKey,
 
117
                                                                                                 Setting::SSLKeyDef )
117
118
                        .toString() );
118
119
        d->m_pServerKey->setModified( false );
119
120
        d->m_pServerKey->setToolTip( tr("Klucz prywatny serwera,\n"
121
122
 
122
123
        d->m_pDefaultKey = new QCheckBox( tr("Domyślny"), box2 );
123
124
        d->m_pDefaultKey->setChecked(
124
 
                        Core::instance()->settings()->value("general/network/SSLKeyDefault",
125
 
                                                                                                 QVariant(true) )
 
125
                        Core::instance()->settings()->value( Setting::SSLKeyDefaultKey,
 
126
                                                                                                 Setting::SSLKeyDefaultDef )
126
127
                        .toBool() );
127
128
        if( d->m_pDefaultKey->isChecked() )
128
129
                d->m_pServerKey->setEnabled( false );
134
135
 
135
136
        d->m_pServerCert = new OpenLineEdit( box2 );
136
137
        d->m_pServerCert->setText(
137
 
                        Core::instance()->settings()->value( "general/network/SSLCert",
138
 
                                                                                                 QVariant() )
 
138
                        Core::instance()->settings()->value( Setting::SSLCertKey,
 
139
                                                                                                 Setting::SSLCertDef )
139
140
                        .toString() );
140
141
        d->m_pServerCert->setModified( false );
141
142
        d->m_pServerCert->setToolTip( tr("Certyfikat serwera,\n"
143
144
 
144
145
        d->m_pDefaultCert = new QCheckBox( tr("Domyślny"), box2 );
145
146
        d->m_pDefaultCert->setChecked(
146
 
                Core::instance()->settings()->value("general/network/SSLCertDefault",
147
 
                                                                                        QVariant(true) )
 
147
                        Core::instance()->settings()->value( Setting::SSLCertDefaultKey,
 
148
                                                                                                 Setting::SSLCertDefaultDef )
148
149
                .toBool() );
149
150
        if( d->m_pDefaultCert->isChecked() )
150
151
                d->m_pServerCert->setEnabled( false );
156
157
 
157
158
        d->m_pServerCa = new OpenLineEdit( box2 );
158
159
        d->m_pServerCa->setText(
159
 
                        Core::instance()->settings()->value( "general/network/SSLCertCA",
160
 
                                                                                                 QVariant() )
 
160
                        Core::instance()->settings()->value( Setting::SSLCertCAKey,
 
161
                                                                                                 Setting::SSLCertCADef )
161
162
                        .toString() );
162
163
        d->m_pServerCa->setModified( false );
163
164
        d->m_pServerCa->setToolTip( tr("Certyfikat CA dla certyfikatu serwera,\n"
166
167
 
167
168
        d->m_pDefaultCa = new QCheckBox( tr("Podpis własny"), box2 );
168
169
        d->m_pDefaultCa->setChecked(
169
 
                Core::instance()->settings()->value("general/network/SSLCertCADefault",
170
 
                                                                                        QVariant(true) )
 
170
                        Core::instance()->settings()->value( Setting::SSLCertCADefaultKey,
 
171
                                                                                                 Setting::SSLCertCADefaultDef )
171
172
                .toBool() );
172
173
        if( d->m_pDefaultCa->isChecked() )
173
174
                d->m_pServerCa->setEnabled( false );
233
234
 
234
235
void NetworkSD::save(){
235
236
        if( d->m_spinboxChanged ){
236
 
                Core::instance()->settings()->setValue( "general/network/incomingPort",
 
237
                Core::instance()->settings()->setValue( Setting::incomingPortKey,
237
238
                                                                                                d->m_pListeningPort->value() );
238
239
                d->m_spinboxChanged = false;
239
240
        }
241
242
        if( d->m_pServerKey->isModified() ){
242
243
                if( d->m_pServerKey->isEmpty() ){
243
244
                        Core::instance()->settings()->setValue(
244
 
                                        "general/network/SSLKeyDefault", true );
 
245
                                        Setting::SSLKeyDefaultKey, true );
245
246
                        d->m_pDefaultKey->setChecked( true );
246
247
                        d->m_keyBoxChanged = false;
247
248
                }
248
249
 
249
 
                Core::instance()->settings()->setValue( "general/network/SSLKey",
 
250
                Core::instance()->settings()->setValue( Setting::SSLKeyKey,
250
251
                                                                                                d->m_pServerKey->text() );
251
252
 
252
253
                d->m_pServerKey->setModified( false );
255
256
        if( d->m_pServerCert->isModified() ){
256
257
                if( d->m_pServerCert->isEmpty() ){
257
258
                        Core::instance()->settings()->setValue(
258
 
                                        "general/network/SSLCertDefault", true );
 
259
                                        Setting::SSLCertDefaultKey, true );
259
260
                        d->m_pDefaultCert->setChecked( true );
260
261
                        d->m_certBoxChanged = false;
261
262
                }
262
263
 
263
 
                Core::instance()->settings()->setValue( "general/network/SSLCert",
 
264
                Core::instance()->settings()->setValue( Setting::SSLCertKey,
264
265
                                                                                                d->m_pServerCert->text() );
265
266
 
266
267
                d->m_pServerCert->setModified( false );
269
270
        if( d->m_pServerCa->isModified() ){
270
271
                if( d->m_pServerCa->isEmpty() ){
271
272
                        Core::instance()->settings()->setValue(
272
 
                                        "general/network/SSLCertCADefault", true );
 
273
                                        Setting::SSLCertCADefaultKey, true );
273
274
                        d->m_pDefaultCa->setChecked( true );
274
275
                        d->m_caBoxChanged = false;
275
276
                }
276
277
 
277
 
                Core::instance()->settings()->setValue( "general/network/SSLCertCA",
 
278
                Core::instance()->settings()->setValue( Setting::SSLCertCAKey,
278
279
                                                                                                d->m_pServerCa->text() );
279
280
 
280
281
                d->m_pServerCa->setModified( false );
282
283
 
283
284
        if( d->m_keyBoxChanged ){
284
285
                Core::instance()->settings()->setValue(
285
 
                                "general/network/SSLKeyDefault",
 
286
                                Setting::SSLKeyDefaultKey,
286
287
                                d->m_pDefaultKey->isChecked()
287
288
                );
288
289
 
291
292
 
292
293
        if( d->m_certBoxChanged ){
293
294
                Core::instance()->settings()->setValue(
294
 
                                "general/network/SSLCertDefault",
 
295
                                Setting::SSLCertDefaultKey,
295
296
                                d->m_pDefaultCert->isChecked()
296
297
                );
297
298
 
300
301
 
301
302
        if( d->m_caBoxChanged ){
302
303
                Core::instance()->settings()->setValue(
303
 
                                "general/network/SSLCertCADefault",
 
304
                                Setting::SSLCertCADefaultKey,
304
305
                                d->m_pDefaultCa->isChecked()
305
306
                );
306
307
 
312
313
        if( d->m_spinboxChanged ){
313
314
                d->m_pListeningPort->setValue(
314
315
                                Core::instance()->settings()->value(
315
 
                                                "general/network/incomingPort",
316
 
                                                QVariant(443) ).toInt() );
 
316
                                                Setting::incomingPortKey,
 
317
                                                Setting::incomingPortDef ).toInt() );
317
318
 
318
319
                d->m_spinboxChanged = false;
319
320
        }
320
321
 
321
322
        if( d->m_pServerKey->isModified() ){
322
323
                d->m_pServerKey->setText(
323
 
                                Core::instance()->settings()->value( "general/network/SSLKey",
324
 
                                                                                                         QVariant() )
 
324
                                Core::instance()->settings()->value( Setting::SSLKeyKey,
 
325
                                                                                                         Setting::SSLKeyDef )
325
326
                                .toString() );
326
327
                d->m_pServerKey->setModified( false );
327
328
        }
328
329
 
329
330
        if( d->m_pServerCert->isModified() ){
330
331
                d->m_pServerCert->setText(
331
 
                                Core::instance()->settings()->value( "general/network/SSLCert",
332
 
                                                                                                         QVariant() )
 
332
                                Core::instance()->settings()->value( Setting::SSLCertKey,
 
333
                                                                                                         Setting::SSLCertDef )
333
334
                                .toString() );
334
335
                d->m_pServerCert->setModified( false );
335
336
        }
336
337
 
337
338
        if( d->m_pServerCa->isModified() ){
338
339
                d->m_pServerCa->setText(
339
 
                                Core::instance()->settings()->value("general/network/SSLCertCA",
340
 
                                                                                                        QVariant() )
 
340
                                Core::instance()->settings()->value( Setting::SSLCertCAKey,
 
341
                                                                                                         Setting::SSLCertCADef )
341
342
                                .toString() );
342
343
                d->m_pServerCa->setModified( false );
343
344
        }
345
346
        if( d->m_keyBoxChanged ){
346
347
                d->m_pDefaultKey->setChecked(
347
348
                                Core::instance()->settings()->value(
348
 
                                                "general/network/SSLKeyDefault",
349
 
                                                QVariant(true) ).toBool() );
 
349
                                                Setting::SSLKeyDefaultKey,
 
350
                                                Setting::SSLKeyDefaultDef ).toBool() );
350
351
 
351
352
                d->m_keyBoxChanged = false;
352
353
        }
354
355
        if( d->m_certBoxChanged ){
355
356
                d->m_pDefaultCert->setChecked(
356
357
                        Core::instance()->settings()->value(
357
 
                                        "general/network/SSLCertDefault",
358
 
                                        QVariant(true) ).toBool() );
 
358
                                        Setting::SSLCertDefaultKey,
 
359
                                        Setting::SSLCertDefaultDef ).toBool() );
359
360
 
360
361
                d->m_certBoxChanged = false;
361
362
        }
363
364
        if( d->m_caBoxChanged ){
364
365
                d->m_pDefaultCa->setChecked(
365
366
                        Core::instance()->settings()->value(
366
 
                                        "general/network/SSLCertCADefault",
367
 
                                        QVariant(true) ).toBool() );
 
367
                                        Setting::SSLCertCADefaultKey,
 
368
                                        Setting::SSLCertCADefaultDef ).toBool() );
368
369
 
369
370
                d->m_caBoxChanged = false;
370
371
        }