@@ -205,26 +205,29 @@ void MainWindow::showSearchDialog()
205
205
/* ****************************************************************************/
206
206
void MainWindow::init ()
207
207
{
208
+ hexEdit = new QHexEdit;
209
+ setCentralWidget (hexEdit);
210
+ readSettings ();
211
+ writeSettings (); // Write the settings for the optionsdialog
212
+
208
213
setAttribute (Qt::WA_DeleteOnClose);
209
- optionsDialog = new OptionsDialog (this );
210
- connect (optionsDialog, SIGNAL (accepted ()), this , SLOT (optionsAccepted ()));
211
214
isUntitled = true ;
212
215
isModified = false ;
213
216
214
- hexEdit = new QHexEdit;
215
- setCentralWidget (hexEdit);
216
- connect (hexEdit, SIGNAL (overwriteModeChanged (bool )), this , SLOT (setOverwriteMode (bool )));
217
- connect (hexEdit, SIGNAL (dataChanged ()), this , SLOT (dataChanged ()));
217
+ optionsDialog = new OptionsDialog (this );
218
+ connect (optionsDialog, SIGNAL (accepted ()), this , SLOT (optionsAccepted ()));
219
+
218
220
searchDialog = new SearchDialog (hexEdit, this );
219
221
220
222
createActions ();
221
223
createMenus ();
222
224
createToolBars ();
223
225
createStatusBar ();
224
226
225
- readSettings ();
226
-
227
227
setUnifiedTitleAndToolBarOnMac (true );
228
+
229
+ connect (hexEdit, SIGNAL (overwriteModeChanged (bool )), this , SLOT (setOverwriteMode (bool )));
230
+ connect (hexEdit, SIGNAL (dataChanged ()), this , SLOT (dataChanged ()));
228
231
}
229
232
230
233
void MainWindow::createActions ()
@@ -384,24 +387,56 @@ void MainWindow::readSettings()
384
387
move (pos);
385
388
resize (size);
386
389
387
- hexEdit->setAddressArea (settings.value (" AddressArea" ).toBool ());
388
- hexEdit->setAsciiArea (settings.value (" AsciiArea" ).toBool ());
389
- hexEdit->setHighlighting (settings.value (" Highlighting" ).toBool ());
390
- hexEdit->setOverwriteMode (settings.value (" OverwriteMode" ).toBool ());
391
- hexEdit->setReadOnly (settings.value (" ReadOnly" ).toBool ());
392
-
393
- hexEdit->setHighlightingColor (settings.value (" HighlightingColor" ).value <QColor>());
394
- hexEdit->setAddressAreaColor (settings.value (" AddressAreaColor" ).value <QColor>());
395
- hexEdit->setSelectionColor (settings.value (" SelectionColor" ).value <QColor>());
396
- hexEdit->setFont (settings.value (" WidgetFont" ).value <QFont>());
397
- hexEdit->setAddressFontColor (settings.value (" AddressFontColor" ).value <QColor>());
398
- hexEdit->setAsciiAreaColor (settings.value (" AsciiAreaColor" ).value <QColor>());
399
- hexEdit->setAsciiFontColor (settings.value (" AsciiFontColor" ).value <QColor>());
400
- hexEdit->setHexFontColor (settings.value (" HexFontColor" ).value <QColor>());
401
-
402
- hexEdit->setAddressWidth (settings.value (" AddressAreaWidth" ).toInt ());
403
- hexEdit->setBytesPerLine (settings.value (" BytesPerLine" ).toInt ());
404
- hexEdit->setHexCaps (settings.value (" HexCaps" , true ).toBool ());
390
+ hexEdit->setAddressArea (
391
+ settings.value (" AddressArea" , hexEdit->addressArea ()).toBool ()
392
+ );
393
+ hexEdit->setAsciiArea (
394
+ settings.value (" AsciiArea" , hexEdit->asciiArea ()).toBool ()
395
+ );
396
+ hexEdit->setHighlighting (
397
+ settings.value (" Highlighting" , hexEdit->highlighting ()).toBool ()
398
+ );
399
+ hexEdit->setOverwriteMode (
400
+ settings.value (" OverwriteMode" , hexEdit->overwriteMode ()).toBool ()
401
+ );
402
+ hexEdit->setReadOnly (
403
+ settings.value (" ReadOnly" , hexEdit->isReadOnly ()).toBool ()
404
+ );
405
+
406
+ hexEdit->setHighlightingColor (
407
+ settings.value (" HighlightingColor" , hexEdit->highlightingColor ()).value <QColor>()
408
+ );
409
+ hexEdit->setAddressAreaColor (
410
+ settings.value (" AddressAreaColor" , hexEdit->addressAreaColor ()).value <QColor>()
411
+ );
412
+ hexEdit->setSelectionColor (
413
+ settings.value (" SelectionColor" , hexEdit->selectionColor ()).value <QColor>()
414
+ );
415
+ hexEdit->setFont (
416
+ settings.value (" WidgetFont" , hexEdit->font ()).value <QFont>()
417
+ );
418
+ hexEdit->setAddressFontColor (
419
+ settings.value (" AddressFontColor" , hexEdit->addressFontColor ()).value <QColor>()
420
+ );
421
+ hexEdit->setAsciiAreaColor (
422
+ settings.value (" AsciiAreaColor" , hexEdit->asciiAreaColor ()).value <QColor>()
423
+ );
424
+ hexEdit->setAsciiFontColor (
425
+ settings.value (" AsciiFontColor" , hexEdit->asciiFontColor ()).value <QColor>()
426
+ );
427
+ hexEdit->setHexFontColor (
428
+ settings.value (" HexFontColor" , hexEdit->hexFontColor ()).value <QColor>()
429
+ );
430
+
431
+ hexEdit->setAddressWidth (
432
+ settings.value (" AddressAreaWidth" , hexEdit->addressWidth ()).toInt ()
433
+ );
434
+ hexEdit->setBytesPerLine (
435
+ settings.value (" BytesPerLine" , hexEdit->bytesPerLine ()).toInt ()
436
+ );
437
+ hexEdit->setHexCaps (
438
+ settings.value (" HexCaps" , hexEdit->hexCaps ()
439
+ ).toBool ());
405
440
}
406
441
407
442
bool MainWindow::saveFile (const QString &fileName)
0 commit comments