nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup search highlighting

Browse Source 
.. 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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GcCalendar.cpp
View File

@@ -716,7 +716,7 @@ GcMiniCalendar::clearRide()
}
void
GcMiniCalendar::setFilter(QList<QString>filter)
GcMiniCalendar::setFilter(QStringList filter)
{
filters = filter;
}
@@ -822,7 +822,7 @@ GcMultiCalendar::GcMultiCalendar(MainWindow *main) : QScrollArea(main), main(mai
}
void
GcMultiCalendar::setFilter(QList<QString>filter)
GcMultiCalendar::setFilter(QStringList filter)
{
for (int i=0; i<calendars.count();i++) {
calendars.at(i)->setFilter(filter);

8
src/GcCalendar.h
View File

@@ -77,7 +77,7 @@ class GcMiniCalendar : public QWidget
void getDate(int &_month, int &_year) { _month = month; _year = year; }
void clearRide();
void setFilter(QList<QString> filter);
void setFilter(QStringList filter);
void clearFilter();
public slots:
@@ -114,7 +114,7 @@ class GcMiniCalendar : public QWidget
GcCalendarModel *calendarModel;
bool master;
QList<QString> filters;
QStringList filters;
};
class GcMultiCalendar : public QScrollArea
@@ -130,7 +130,7 @@ class GcMultiCalendar : public QScrollArea
void dateChanged(int month, int year);
void setRide(RideItem *ride);
void resizeEvent(QResizeEvent*);
void setFilter(QList<QString> filter);
void setFilter(QStringList filter);
void clearFilter();
@@ -156,7 +156,7 @@ class GcCalendar : public QWidget // not a GcWindow - belongs on sidebar
void refresh();
void setSummary(); // set the summary at the bottom
void setFilter(QList<QString> filters) { multiCalendar->setFilter(filters);}
void setFilter(QStringList filters) { multiCalendar->setFilter(filters);}
void clearFilter() { multiCalendar->clearFilter();}
signals:

6
src/MainWindow.cpp
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);