merge
This commit is contained in:
+5
-2
@@ -235,8 +235,11 @@ Usage(void)
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
// If "-t" is present at all, we don't do the GUI thing and pass the
|
||||
// whole to recollq for command line / pipe usage.
|
||||
// if we are named recollq or option "-t" is present at all, we
|
||||
// don't do the GUI thing and pass the whole to recollq for
|
||||
// command line / pipe usage.
|
||||
if (!strcmp(argv[0], "recollq"))
|
||||
exit(recollq(&theconfig, argc, argv));
|
||||
for (int i = 0; i < argc; i++) {
|
||||
if (!strcmp(argv[i], "-t")) {
|
||||
exit(recollq(&theconfig, argc, argv));
|
||||
|
||||
@@ -85,8 +85,7 @@ void RclMain::showFragButs()
|
||||
connect(fragbuts, SIGNAL(fragmentsChanged()),
|
||||
this, SLOT(onFragmentsChanged()));
|
||||
} else {
|
||||
delete fragbuts;
|
||||
fragbuts = 0;
|
||||
deleteZ(fragbuts);
|
||||
}
|
||||
} else {
|
||||
// Close and reopen, in hope that makes us visible...
|
||||
|
||||
@@ -279,6 +279,9 @@ void RclMain::init()
|
||||
QKeySequence seq("Ctrl+Shift+s");
|
||||
QShortcut *sc = new QShortcut(seq, this);
|
||||
connect(sc, SIGNAL (activated()), sSearch, SLOT (takeFocus()));
|
||||
QKeySequence seql("Ctrl+l");
|
||||
sc = new QShortcut(seql, this);
|
||||
connect(sc, SIGNAL (activated()), sSearch, SLOT (takeFocus()));
|
||||
|
||||
connect(&m_watcher, SIGNAL(fileChanged(QString)),
|
||||
this, SLOT(idxStatus()));
|
||||
|
||||
Reference in New Issue
Block a user