Switch to unified view

a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp
...
...
718
    case IXST_NOTRUNNING:
718
    case IXST_NOTRUNNING:
719
    {
719
    {
720
    // Could also mean that no helpers are missing, but then we
720
    // Could also mean that no helpers are missing, but then we
721
    // won't try to show a message anyway (which is what
721
    // won't try to show a message anyway (which is what
722
    // firstIndexing is used for)
722
    // firstIndexing is used for)
723
  string mhd;
723
    m_firstIndexing = theconfig->getMissingHelperDesc().empty();
724
    m_firstIndexing = !theconfig->getMissingHelperDesc(mhd);
724
725
725
    vector<string> args;
726
    vector<string> args;
726
    args.push_back("-c");
727
    args.push_back("-c");
727
    args.push_back(theconfig->getConfDir());
728
    args.push_back(theconfig->getConfDir());
728
    m_idxproc = new ExecCmd;
729
    m_idxproc = new ExecCmd;
...
...
749
                     QMessageBox::NoButton);
750
                     QMessageBox::NoButton);
750
    if (rep == QMessageBox::Ok) {
751
    if (rep == QMessageBox::Ok) {
751
        // Could also mean that no helpers are missing, but then we
752
        // Could also mean that no helpers are missing, but then we
752
        // won't try to show a message anyway (which is what
753
        // won't try to show a message anyway (which is what
753
        // firstIndexing is used for)
754
        // firstIndexing is used for)
755
      string mhd;
754
        m_firstIndexing = theconfig->getMissingHelperDesc().empty();
756
        m_firstIndexing = !theconfig->getMissingHelperDesc(mhd);
755
        vector<string> args;
757
        vector<string> args;
756
        args.push_back("-c");
758
        args.push_back("-c");
757
        args.push_back(theconfig->getConfDir());
759
        args.push_back(theconfig->getConfDir());
758
        args.push_back("-z");
760
        args.push_back("-z");
759
        m_idxproc = new ExecCmd;
761
        m_idxproc = new ExecCmd;
...
...
1067
    QMessageBox::information(this, tr("About Recoll"), vstring.c_str());
1069
    QMessageBox::information(this, tr("About Recoll"), vstring.c_str());
1068
}
1070
}
1069
1071
1070
void RclMain::showMissingHelpers()
1072
void RclMain::showMissingHelpers()
1071
{
1073
{
1074
    string miss;
1072
    string miss = theconfig->getMissingHelperDesc();
1075
    if (!theconfig->getMissingHelperDesc(miss)) {
1076
  QMessageBox::information(this, "", tr("Indexing did not run yet"));
1077
  return;
1078
    }
1073
    QString msg = QString::fromAscii("<p>") +
1079
    QString msg = QString::fromAscii("<p>") +
1074
    tr("External applications/commands needed and not found "
1080
    tr("External applications/commands needed and not found "
1075
             "for indexing your file types:\n\n");
1081
             "for indexing your file types:\n\n");
1076
    msg += "(<i>";
1082
    msg += "(<i>";
1077
    msg += QString::fromLocal8Bit(theconfig->getConfDir().c_str());
1083
    msg += QString::fromLocal8Bit(theconfig->getConfDir().c_str());
...
...
1126
        mtypesfromdbconf.insert(*it);
1132
        mtypesfromdbconf.insert(*it);
1127
    }
1133
    }
1128
1134
1129
    // Substract the types for missing helpers (the docs are indexed
1135
    // Substract the types for missing helpers (the docs are indexed
1130
    // by name only):
1136
    // by name only):
1131
    string miss = theconfig->getMissingHelperDesc();
1137
    string miss;
1132
    if (!miss.empty()) {
1138
    if (theconfig->getMissingHelperDesc(miss) && !miss.empty()) {
1133
    FIMissingStore st(miss);
1139
    FIMissingStore st(miss);
1134
    map<string, set<string> >::const_iterator it;
1140
    map<string, set<string> >::const_iterator it;
1135
    for (it = st.m_typesForMissing.begin(); 
1141
    for (it = st.m_typesForMissing.begin(); 
1136
         it != st.m_typesForMissing.end(); it++) {
1142
         it != st.m_typesForMissing.end(); it++) {
1137
        set<string>::const_iterator it1;
1143
        set<string>::const_iterator it1;