Switch to unified view

a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp
...
...
1057
void RclMain::showFragButs()
1057
void RclMain::showFragButs()
1058
{
1058
{
1059
    if (fragbuts == 0) {
1059
    if (fragbuts == 0) {
1060
    fragbuts = new FragButs(0);
1060
    fragbuts = new FragButs(0);
1061
    fragbuts->show();
1061
    fragbuts->show();
1062
        connect(fragbuts, SIGNAL(fragmentsChanged()),
1063
                this, SLOT(onFragmentsChanged()));
1062
    } else {
1064
    } else {
1063
    // Close and reopen, in hope that makes us visible...
1065
    // Close and reopen, in hope that makes us visible...
1064
    fragbuts->close();
1066
    fragbuts->close();
1065
        fragbuts->show();
1067
        fragbuts->show();
1066
    }
1068
    }
...
...
2246
    default:
2248
    default:
2247
        m_filtCMB->setCurrentIndex(id);
2249
        m_filtCMB->setCurrentIndex(id);
2248
        m_filtMN->actions()[id]->setChecked(true);
2250
        m_filtMN->actions()[id]->setChecked(true);
2249
    }
2251
    }
2250
2252
2253
    m_catgbutvecidx = id;
2254
    setFiltSpec();
2255
}
2256
2257
void RclMain::setFiltSpec()
2258
{
2251
    m_filtspec.reset();
2259
    m_filtspec.reset();
2252
2260
2261
    // "Category" buttons
2253
    if (id != 0)  {
2262
    if (m_catgbutvecidx != 0)  {
2254
    string catg = m_catgbutvec[id];
2263
    string catg = m_catgbutvec[m_catgbutvecidx];
2255
    string frag;
2264
    string frag;
2256
    theconfig->getGuiFilter(catg, frag);
2265
    theconfig->getGuiFilter(catg, frag);
2257
    m_filtspec.orCrit(DocSeqFiltSpec::DSFS_QLANG, frag);
2266
    m_filtspec.orCrit(DocSeqFiltSpec::DSFS_QLANG, frag);
2258
    }
2267
    }
2259
    LOGDEB(("RclMain::catgFilter: calling setFiltSpec\n"));
2268
2269
    // Fragments from the fragbuts buttonbox tool
2270
    if (fragbuts) {
2271
        vector<string> frags;
2272
        fragbuts->getfrags(frags);
2273
        for (vector<string>::const_iterator it = frags.begin();
2274
             it != frags.end(); it++) {
2275
            m_filtspec.orCrit(DocSeqFiltSpec::DSFS_QLANG, *it);
2276
        }
2277
    }
2278
2260
    if (m_source.isNotNull())
2279
    if (m_source.isNotNull())
2261
    m_source->setFiltSpec(m_filtspec);
2280
    m_source->setFiltSpec(m_filtspec);
2262
    initiateQuery();
2281
    initiateQuery();
2282
}
2283
2284
2285
void RclMain::onFragmentsChanged()
2286
{
2287
    setFiltSpec();
2263
}
2288
}
2264
2289
2265
void RclMain::toggleFullScreen()
2290
void RclMain::toggleFullScreen()
2266
{
2291
{
2267
    if (isFullScreen())
2292
    if (isFullScreen())