|
|
@ -55,15 +55,11 @@ void TrainingGuide::paintEvent(QPaintEvent *event) { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void OnboardingWindow::accept_buttons(){ |
|
|
|
void OnboardingWindow::accept_buttons(){ |
|
|
|
/*
|
|
|
|
if(flickable->property("atYEnd").toInt()){ |
|
|
|
if(QQmlProperty::read(flick, "atYEnd").toBool()){ |
|
|
|
|
|
|
|
accept_btn->setText("Accept"); |
|
|
|
accept_btn->setText("Accept"); |
|
|
|
accept_btn->setEnabled(true); |
|
|
|
accept_btn->setEnabled(true); |
|
|
|
} |
|
|
|
} |
|
|
|
return; |
|
|
|
return; |
|
|
|
*/ |
|
|
|
|
|
|
|
printf("asdf\n"); |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
QWidget* OnboardingWindow::terms_screen2() { |
|
|
|
QWidget* OnboardingWindow::terms_screen2() { |
|
|
@ -86,7 +82,7 @@ QWidget* OnboardingWindow::terms_screen2() { |
|
|
|
buttons->addWidget(new QPushButton("Decline")); |
|
|
|
buttons->addWidget(new QPushButton("Decline")); |
|
|
|
buttons->addSpacing(50); |
|
|
|
buttons->addSpacing(50); |
|
|
|
|
|
|
|
|
|
|
|
QPushButton *accept_btn = new QPushButton("Scroll to accept"); |
|
|
|
accept_btn = new QPushButton("Scroll to accept"); |
|
|
|
accept_btn->setEnabled(false); |
|
|
|
accept_btn->setEnabled(false); |
|
|
|
buttons->addWidget(accept_btn); |
|
|
|
buttons->addWidget(accept_btn); |
|
|
|
QObject::connect(accept_btn, &QPushButton::released, [=]() { |
|
|
|
QObject::connect(accept_btn, &QPushButton::released, [=]() { |
|
|
@ -95,7 +91,7 @@ QWidget* OnboardingWindow::terms_screen2() { |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
QObject *obj = (QObject*)view->rootObject(); |
|
|
|
QObject *obj = (QObject*)view->rootObject(); |
|
|
|
//QObject *flick = obj->findChild<QObject*>("flickArea");
|
|
|
|
flickable = obj->findChild<QObject*>("flickArea"); |
|
|
|
|
|
|
|
|
|
|
|
QObject::connect(obj, SIGNAL(qmlSignal(QVariant)), SLOT(accept_buttons())); |
|
|
|
QObject::connect(obj, SIGNAL(qmlSignal(QVariant)), SLOT(accept_buttons())); |
|
|
|
|
|
|
|
|
|
|
|