Switch to unified view

a/src/qtgui/advsearch.ui.h b/src/qtgui/advsearch.ui.h
...
...
38
#endif /* NO_NAMESPACES */
38
#endif /* NO_NAMESPACES */
39
39
40
#include "recoll.h"
40
#include "recoll.h"
41
#include "rclconfig.h"
41
#include "rclconfig.h"
42
#include "debuglog.h"
42
#include "debuglog.h"
43
#include "searchdata.h"
43
44
44
extern RclConfig *rclconfig;
45
extern RclConfig *rclconfig;
45
46
46
// Constructor/initialization
47
// Constructor/initialization
47
void advsearch::init()
48
void advsearch::init()
...
...
130
    Rcl::AdvSearchData mydata;
131
    Rcl::AdvSearchData mydata;
131
132
132
    mydata.allwords = string((const char*)(andWordsLE->text().utf8()));
133
    mydata.allwords = string((const char*)(andWordsLE->text().utf8()));
133
    mydata.phrase  = string((const char*)(phraseLE->text().utf8()));
134
    mydata.phrase  = string((const char*)(phraseLE->text().utf8()));
134
    mydata.orwords = string((const char*)(orWordsLE->text().utf8()));
135
    mydata.orwords = string((const char*)(orWordsLE->text().utf8()));
136
    mydata.orwords1 = string((const char*)(orWords1LE->text().utf8()));
135
    mydata.nowords = string((const char*)(noWordsLE->text().utf8()));
137
    mydata.nowords = string((const char*)(noWordsLE->text().utf8()));
136
    mydata.filename = string((const char*)(fileNameLE->text().utf8()));
138
    mydata.filename = string((const char*)(fileNameLE->text().utf8()));
137
139
138
    if (mydata.allwords.empty() && mydata.phrase.empty() && 
140
    if (mydata.allwords.empty() && mydata.phrase.empty() && 
139
    mydata.orwords.empty() && mydata.filename.empty()) {
141
    mydata.orwords.empty() && mydata.orwords1.empty() && 
142
  mydata.filename.empty()) {
140
    if (mydata.nowords.empty())
143
    if (mydata.nowords.empty())
141
        return;
144
        return;
142
    QMessageBox::warning(0, "Recoll",
145
    QMessageBox::warning(0, "Recoll",
143
                 tr("Cannot execute pure negative query. "
146
                 tr("Cannot execute pure negative query. "
144
                "Please enter common terms in the 'any words' field")); 
147
                "Please enter common terms in the 'any words' field"));