Switch to unified view

a/src/qtgui/uiprefs_w.cpp b/src/qtgui/uiprefs_w.cpp
...
...
90
        replAbsCB, SLOT(setEnabled(bool)));
90
        replAbsCB, SLOT(setEnabled(bool)));
91
    connect(ssAutoAllCB, SIGNAL(toggled(bool)), 
91
    connect(ssAutoAllCB, SIGNAL(toggled(bool)), 
92
        ssAutoSpaceCB, SLOT(setDisabled(bool)));
92
        ssAutoSpaceCB, SLOT(setDisabled(bool)));
93
    connect(ssAutoAllCB, SIGNAL(toggled(bool)), 
93
    connect(ssAutoAllCB, SIGNAL(toggled(bool)), 
94
        ssAutoSpaceCB, SLOT(setChecked(bool)));
94
        ssAutoSpaceCB, SLOT(setChecked(bool)));
95
96
    setFromPrefs();
95
    setFromPrefs();
97
}
96
}
98
97
99
// Update dialog state from stored prefs
98
// Update dialog state from stored prefs
100
void UIPrefsDialog::setFromPrefs()
99
void UIPrefsDialog::setFromPrefs()
...
...
124
    syntctxSB->setValue(prefs.syntAbsCtx);
123
    syntctxSB->setValue(prefs.syntAbsCtx);
125
124
126
    initStartAdvCB->setChecked(prefs.startWithAdvSearchOpen);
125
    initStartAdvCB->setChecked(prefs.startWithAdvSearchOpen);
127
126
128
    keepSortCB->setChecked(prefs.keepSort);
127
    keepSortCB->setChecked(prefs.keepSort);
128
    showTrayIconCB->setChecked(prefs.showTrayIcon);
129
    closeToTrayCB->setChecked(prefs.closeToTray);
129
    previewHtmlCB->setChecked(prefs.previewHtml);
130
    previewHtmlCB->setChecked(prefs.previewHtml);
130
    switch (prefs.previewPlainPre) {
131
    switch (prefs.previewPlainPre) {
131
    case PrefsPack::PP_BR:
132
    case PrefsPack::PP_BR:
132
    plainBRRB->setChecked(1);
133
    plainBRRB->setChecked(1);
133
    break;
134
    break;
...
...
287
    replAbsCB->isChecked();
288
    replAbsCB->isChecked();
288
289
289
    prefs.startWithAdvSearchOpen = initStartAdvCB->isChecked();
290
    prefs.startWithAdvSearchOpen = initStartAdvCB->isChecked();
290
291
291
    prefs.keepSort = keepSortCB->isChecked();
292
    prefs.keepSort = keepSortCB->isChecked();
293
    prefs.showTrayIcon = showTrayIconCB->isChecked();
294
    prefs.closeToTray = closeToTrayCB->isChecked();
292
    prefs.previewHtml = previewHtmlCB->isChecked();
295
    prefs.previewHtml = previewHtmlCB->isChecked();
293
296
294
    if (plainBRRB->isChecked()) {
297
    if (plainBRRB->isChecked()) {
295
    prefs.previewPlainPre = PrefsPack::PP_BR;
298
    prefs.previewPlainPre = PrefsPack::PP_BR;
296
    } else if (plainPRERB->isChecked()) {
299
    } else if (plainPRERB->isChecked()) {
...
...
516
    return false;
519
    return false;
517
    if (st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) {
520
    if (st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) {
518
    return true;
521
    return true;
519
    }
522
    }
520
    return false;
523
    return false;
524
}
525
526
void UIPrefsDialog::on_showTrayIconCB_clicked()
527
{
528
    closeToTrayCB->setEnabled(showTrayIconCB->checkState());
521
}
529
}
522
530
523
/** 
531
/** 
524
 * Browse to add another index.
532
 * Browse to add another index.
525
 * We do a textual comparison to check for duplicates, except for
533
 * We do a textual comparison to check for duplicates, except for