Fixup search highlighting

.. on Linux/Windows since its slightly different.
.. also fixes a SEGV
This commit is contained in:
Mark Liversedge
2013-03-23 21:06:10 +00:00
parent 3a1e3126fb
commit 4358e152dd
3 changed files with 10 additions and 8 deletions

View File

@@ -562,6 +562,10 @@ MainWindow::MainWindow(const QDir &home) :
listView = new RideNavigator(this, true);
listView->setProperty("nomenu", true);
// sidebar items
gcCalendar = new GcCalendar(this);
gcMultiCalendar = new GcMultiCalendar(this);
// we need to connect the search box on Linux/Windows
#if !defined (Q_OS_MAC) && defined (GC_HAVE_LUCENE)
connect(searchBox, SIGNAL(searchResults(QStringList)), listView, SLOT(searchStrings(QStringList)));
@@ -620,7 +624,6 @@ MainWindow::MainWindow(const QDir &home) :
intervalSplitter->setCollapsible(1, false);
GcSplitterItem *calendarItem = new GcSplitterItem(tr("Calendar"), iconFromPNG(":images/sidebar/calendar.png"), this);
gcMultiCalendar = new GcMultiCalendar(this);
calendarItem->addWidget(gcMultiCalendar);
analItem = new GcSplitterItem(tr("Activities"), iconFromPNG(":images/sidebar/folder.png"), this);
@@ -730,7 +733,6 @@ MainWindow::MainWindow(const QDir &home) :
// POPULATE TOOLBOX
// do controllers after home windows -- they need their first signals caught
gcCalendar = new GcCalendar(this);
connect(gcCalendar, SIGNAL(dateRangeChanged(DateRange)), this, SLOT(dateRangeChangedDiary(DateRange)));
ltmSidebar = new LTMSidebar(this, home);