Switch to unified view

a/src/qtgui/guiutils.cpp b/src/qtgui/guiutils.cpp
...
...
103
        sprintf(buf, "%d ", clause);
103
        sprintf(buf, "%d ", clause);
104
        advSearchClauses += QString::fromUtf8(buf);
104
        advSearchClauses += QString::fromUtf8(buf);
105
    }
105
    }
106
    }
106
    }
107
    QString ascdflt;
107
    QString ascdflt;
108
    SETTING_RW(advSearchClauses, "/Recoll/prefs/adv/clauseList", String, ascdflt);
108
    SETTING_RW(advSearchClauses,"/Recoll/prefs/adv/clauseList", String, ascdflt);
109
    if (!writing) {
109
    if (!writing) {
110
    vector<string> clauses;
110
    vector<string> clauses;
111
    stringToStrings(qs2utf8s(advSearchClauses), clauses);
111
    stringToStrings(qs2utf8s(advSearchClauses), clauses);
112
        // There was a long-lurking bug where the clause list was
112
        // There was a long-lurking bug where the clause list was
113
        // growing to absurd sizes. The prefs.advSearchClauses clear()
113
        // growing to absurd sizes. The prefs.advSearchClauses clear()
...
...
124
    for (auto clause : clauses) {
124
    for (auto clause : clauses) {
125
        prefs.advSearchClauses.push_back(atoi(clause.c_str()));
125
        prefs.advSearchClauses.push_back(atoi(clause.c_str()));
126
    }
126
    }
127
    }
127
    }
128
128
129
    SETTING_RW(prefs.ssearchOnWS, "/Recoll/prefs/reslist/autoSearchOnWS", 
130
         Bool, false);
131
    SETTING_RW(prefs.ssearchNoComplete, 
129
    SETTING_RW(prefs.ssearchNoComplete, 
132
           "/Recoll/prefs/ssearch/noComplete", Bool, false);
130
           "/Recoll/prefs/ssearch/noComplete", Bool, false);
133
    SETTING_RW(prefs.ssearchAsYouType, 
134
         "/Recoll/prefs/ssearch/asYouType", Bool, false);
135
    SETTING_RW(prefs.filterCtlStyle, "/Recoll/prefs/filterCtlStyle", Int, 0);
131
    SETTING_RW(prefs.filterCtlStyle, "/Recoll/prefs/filterCtlStyle", Int, 0);
136
    SETTING_RW(prefs.ssearchAutoPhrase, 
132
    SETTING_RW(prefs.ssearchAutoPhrase, 
137
           "/Recoll/prefs/ssearchAutoPhrase", Bool, true);
133
           "/Recoll/prefs/ssearchAutoPhrase", Bool, true);
138
    SETTING_RW(prefs.ssearchAutoPhraseThreshPC, 
134
    SETTING_RW(prefs.ssearchAutoPhraseThreshPC, 
139
           "/Recoll/prefs/ssearchAutoPhraseThreshPC", Double, 2.0);
135
           "/Recoll/prefs/ssearchAutoPhraseThreshPC", Double, 2.0);
...
...
441
        stemLang = "";
437
        stemLang = "";
442
    }
438
    }
443
    return stemLang;
439
    return stemLang;
444
}
440
}
445
441
442
#ifdef SHOWEVENTS
443
const char *eventTypeToStr(int tp)
444
{
445
    switch (tp) {
446
    case  0: return "None";
447
    case  1: return "Timer";
448
    case  2: return "MouseButtonPress";
449
    case  3: return "MouseButtonRelease";
450
    case  4: return "MouseButtonDblClick";
451
    case  5: return "MouseMove";
452
    case  6: return "KeyPress";
453
    case  7: return "KeyRelease";
454
    case  8: return "FocusIn";
455
    case  9: return "FocusOut";
456
    case  10: return "Enter";
457
    case  11: return "Leave";
458
    case  12: return "Paint";
459
    case  13: return "Move";
460
    case  14: return "Resize";
461
    case  15: return "Create";
462
    case  16: return "Destroy";
463
    case  17: return "Show";
464
    case  18: return "Hide";
465
    case  19: return "Close";
466
    case  20: return "Quit";
467
    case  21: return "ParentChange";
468
    case  131: return "ParentAboutToChange";
469
    case  22: return "ThreadChange";
470
    case  24: return "WindowActivate";
471
    case  25: return "WindowDeactivate";
472
    case  26: return "ShowToParent";
473
    case  27: return "HideToParent";
474
    case  31: return "Wheel";
475
    case  33: return "WindowTitleChange";
476
    case  34: return "WindowIconChange";
477
    case  35: return "ApplicationWindowIconChange";
478
    case  36: return "ApplicationFontChange";
479
    case  37: return "ApplicationLayoutDirectionChange";
480
    case  38: return "ApplicationPaletteChange";
481
    case  39: return "PaletteChange";
482
    case  40: return "Clipboard";
483
    case  42: return "Speech";
484
    case  43: return "MetaCall";
485
    case  50: return "SockAct";
486
    case  132: return "WinEventAct";
487
    case  52: return "DeferredDelete";
488
    case  60: return "DragEnter";
489
    case  61: return "DragMove";
490
    case  62: return "DragLeave";
491
    case  63: return "Drop";
492
    case  64: return "DragResponse";
493
    case  68: return "ChildAdded";
494
    case  69: return "ChildPolished";
495
    case  70: return "ChildInserted";
496
    case  72: return "LayoutHint";
497
    case  71: return "ChildRemoved";
498
    case  73: return "ShowWindowRequest";
499
    case  74: return "PolishRequest";
500
    case  75: return "Polish";
501
    case  76: return "LayoutRequest";
502
    case  77: return "UpdateRequest";
503
    case  78: return "UpdateLater";
504
    case  79: return "EmbeddingControl";
505
    case  80: return "ActivateControl";
506
    case  81: return "DeactivateControl";
507
    case  82: return "ContextMenu";
508
    case  83: return "InputMethod";
509
    case  86: return "AccessibilityPrepare";
510
    case  87: return "TabletMove";
511
    case  88: return "LocaleChange";
512
    case  89: return "LanguageChange";
513
    case  90: return "LayoutDirectionChange";
514
    case  91: return "Style";
515
    case  92: return "TabletPress";
516
    case  93: return "TabletRelease";
517
    case  94: return "OkRequest";
518
    case  95: return "HelpRequest";
519
    case  96: return "IconDrag";
520
    case  97: return "FontChange";
521
    case  98: return "EnabledChange";
522
    case  99: return "ActivationChange";
523
    case  100: return "StyleChange";
524
    case  101: return "IconTextChange";
525
    case  102: return "ModifiedChange";
526
    case  109: return "MouseTrackingChange";
527
    case  103: return "WindowBlocked";
528
    case  104: return "WindowUnblocked";
529
    case  105: return "WindowStateChange";
530
    case  110: return "ToolTip";
531
    case  111: return "WhatsThis";
532
    case  112: return "StatusTip";
533
    case  113: return "ActionChanged";
534
    case  114: return "ActionAdded";
535
    case  115: return "ActionRemoved";
536
    case  116: return "FileOpen";
537
    case  117: return "Shortcut";
538
    case  51: return "ShortcutOverride";
539
    case  30: return "Accel";
540
    case  32: return "AccelAvailable";
541
    case  118: return "WhatsThisClicked";
542
    case  120: return "ToolBarChange";
543
    case  121: return "ApplicationActivated";
544
    case  122: return "ApplicationDeactivated";
545
    case  123: return "QueryWhatsThis";
546
    case  124: return "EnterWhatsThisMode";
547
    case  125: return "LeaveWhatsThisMode";
548
    case  126: return "ZOrderChange";
549
    case  127: return "HoverEnter";
550
    case  128: return "HoverLeave";
551
    case  129: return "HoverMove";
552
    case  119: return "AccessibilityHelp";
553
    case  130: return "AccessibilityDescription";
554
    case  150: return "EnterEditFocus";
555
    case  151: return "LeaveEditFocus";
556
    case  152: return "AcceptDropsChange";
557
    case  153: return "MenubarUpdated";
558
    case  154: return "ZeroTimerEvent";
559
    case  155: return "GraphicsSceneMouseMove";
560
    case  156: return "GraphicsSceneMousePress";
561
    case  157: return "GraphicsSceneMouseRelease";
562
    case  158: return "GraphicsSceneMouseDoubleClick";
563
    case  159: return "GraphicsSceneContextMenu";
564
    case  160: return "GraphicsSceneHoverEnter";
565
    case  161: return "GraphicsSceneHoverMove";
566
    case  162: return "GraphicsSceneHoverLeave";
567
    case  163: return "GraphicsSceneHelp";
568
    case  164: return "GraphicsSceneDragEnter";
569
    case  165: return "GraphicsSceneDragMove";
570
    case  166: return "GraphicsSceneDragLeave";
571
    case  167: return "GraphicsSceneDrop";
572
    case  168: return "GraphicsSceneWheel";
573
    case  169: return "KeyboardLayoutChange";
574
    case  170: return "DynamicPropertyChange";
575
    case  171: return "TabletEnterProximity";
576
    case  172: return "TabletLeaveProximity";
577
    default: return "UnknownEvent";
578
    }
579
}
580
#endif