mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-02-13 16:18:42 +00:00
Merge pull request #3056 from amtriathlon/master
Double-click on LTMPopup ride list selects Activity and Activities view
This commit is contained in:
@@ -29,6 +29,7 @@ env:
|
||||
matrix:
|
||||
include:
|
||||
- os: osx
|
||||
osx_image: xcode10.1
|
||||
compiler: clang
|
||||
- os: linux
|
||||
dist: trusty
|
||||
|
||||
@@ -103,6 +103,7 @@ LTMPopup::LTMPopup(Context *context) : QWidget(context->mainWindow), context(con
|
||||
mainLayout->addWidget(notes);
|
||||
|
||||
connect(rides, SIGNAL(itemSelectionChanged()), this, SLOT(rideSelected()));
|
||||
connect(rides, SIGNAL(itemDoubleClicked(QTableWidgetItem*)), this, SLOT(rideOpen()));
|
||||
|
||||
}
|
||||
|
||||
@@ -518,6 +519,29 @@ LTMPopup::rideSelected()
|
||||
resizeEvent(NULL);
|
||||
}
|
||||
|
||||
void
|
||||
LTMPopup::rideOpen()
|
||||
{
|
||||
// which ride is selected
|
||||
int index = 0;
|
||||
if (rides->selectedItems().count())
|
||||
index = rides->selectedItems().first()->row();
|
||||
|
||||
// do we have any rides and is the index within bounds
|
||||
if (selected.count() > index) {
|
||||
|
||||
RideItem *have = context->athlete->rideCache->getRide(selected[index]);
|
||||
|
||||
if (have) {
|
||||
|
||||
// Select Activity in Activities view
|
||||
context->notifyRideSelected(have);
|
||||
// Select Activities view
|
||||
context->mainWindow->selectAnalysis();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
LTMPopup::resizeEvent(QResizeEvent *)
|
||||
{
|
||||
|
||||
@@ -59,6 +59,7 @@ class LTMPopup : public QWidget
|
||||
|
||||
private slots:
|
||||
void rideSelected(); // scrolling up and down the popup ride list
|
||||
void rideOpen(); // double click an item on the popup ride list
|
||||
virtual void resizeEvent(QResizeEvent *);
|
||||
bool eventFilter(QObject *object, QEvent *e);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user