michael/quill
1
0
Fork 0
mirror of https://github.com/Quill-OS/quill.git synced 2024-12-26 23:57:22 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: michael:32e05489f4e85a2cf9bb990a79509c6ada1c6bc3
Branches Tags
michael:master
michael:dev
michael:localLibraryWidget
michael:userapps
michael:mutool
michael:qtextedit-main
michael:qtextdocument-experimental
michael:2.0
michael:1.9
michael:1.8
michael:1.7
michael:1.6
michael:1.5
michael:1.3
michael:1.2
michael:1.1
michael:1.0
..
compare: michael:77e3adfe9b52961a5fbe2bc57b494678464f3134
Branches Tags
michael:master
michael:dev
michael:localLibraryWidget
michael:userapps
michael:mutool
michael:qtextedit-main
michael:qtextdocument-experimental
michael:2.0
michael:1.9
michael:1.8
michael:1.7
michael:1.6
michael:1.5
michael:1.3
michael:1.2
michael:1.1
michael:1.0

No commits in common. "32e05489f4e85a2cf9bb990a79509c6ada1c6bc3" and "77e3adfe9b52961a5fbe2bc57b494678464f3134" have entirely different histories.
32e05489f4 ... 77e3adfe9b

3 changed files with 70 additions and 152 deletions
Show stats Expand all files Collapse all files

32
src/apps/flashexam.cpp
View file

@ -18,21 +18,16 @@ flashExam::flashExam(QWidget *parent)
ui->revealBtn->setProperty("type", "borderless"); ui->revealBtn->setProperty("type", "borderless");
ui->nextBtn->setProperty("type", "borderless"); ui->nextBtn->setProperty("type", "borderless");
ui->backBtn->setProperty("type", "borderless"); ui->backBtn->setProperty("type", "borderless");
ui->didNotKnowBtn->setProperty("type", "borderless");
ui->startBtn->setStyleSheet("padding: 20px; QPushButton[type='borderless']:pressed { background: black; color: white; border: none }"); ui->startBtn->setStyleSheet("padding: 20px; QPushButton[type='borderless']:pressed { background: black; color: white; border: none }");
ui->closeBtn->setStyleSheet("QPushButton[type='borderless']:pressed { background: black; color: white; border: none}"); ui->closeBtn->setStyleSheet("QPushButton[type='borderless']:pressed { background: black; color: white; border: none}");
ui->revealBtn->setStyleSheet("padding: 20px; QPushButton[type='borderless']:pressed { background: black; color: white; border: none}"); ui->revealBtn->setStyleSheet("padding: 20px; QPushButton[type='borderless']:pressed { background: black; color: white; border: none}");
ui->nextBtn->setStyleSheet("padding: 20px; QPushButton[type='borderless']:pressed { background: black; color: white; border: none}"); ui->nextBtn->setStyleSheet("padding: 20px; QPushButton[type='borderless']:pressed { background: black; color: white; border: none}");
ui->didNotKnowBtn->setStyleSheet("padding: 20px; QPushButton[type='borderless']:pressed { background: black; color: white; border: none}");
ui->backBtn->setStyleSheet("QPushButton[type='borderless']:pressed { background: black; color: white; border: none}"); ui->backBtn->setStyleSheet("QPushButton[type='borderless']:pressed { background: black; color: white; border: none}");
ui->textBrowser->setStyleSheet("font-size: 12pt"); ui->textBrowser->setStyleSheet("font-size: 12pt");
ui->closeBtn->setIcon(QIcon(":/resources/close.png")); ui->closeBtn->setIcon(QIcon(":/resources/close.png"));
ui->backBtn->setIcon(QIcon(":/resources/arrow-left.png")); ui->backBtn->setIcon(QIcon(":/resources/arrow-left.png"));
ui->didNotKnowBtn->setIcon(QIcon(":/resources/close.png"));
ui->nextBtn->setIcon(QIcon(":/resources/check.png"));
ui->nonRedundantRandomizationCheckBox->setDisabled(true); ui->nonRedundantRandomizationCheckBox->setDisabled(true);
ui->randomizeCheckBox->click(); ui->randomizeCheckBox->click();
ui->randomizeCheckBox->setDisabled(true);
graphicsScene = new QGraphicsScene(this); graphicsScene = new QGraphicsScene(this);
setupCardsList(); setupCardsList();
@ -51,7 +46,6 @@ void flashExam::on_closeBtn_clicked()
void flashExam::setupCardsList() { void flashExam::setupCardsList() {
QDir dir("/mnt/onboard/onboard/.flashexam"); QDir dir("/mnt/onboard/onboard/.flashexam");
ui->listWidget->clear(); ui->listWidget->clear();
ui->cardNumberLabel->show();
for (const QString &filename : dir.entryList(QDir::Files)) { for (const QString &filename : dir.entryList(QDir::Files)) {
if(!filename.contains(".answers")) { if(!filename.contains(".answers")) {
ui->listWidget->addItem(filename); ui->listWidget->addItem(filename);
@ -86,7 +80,6 @@ void flashExam::initCardsList(QString cardsList, QString answersList) {
randomize = ui->randomizeCheckBox->isChecked(); randomize = ui->randomizeCheckBox->isChecked();
nonRedundantRandomization = ui->nonRedundantRandomizationCheckBox->isChecked(); nonRedundantRandomization = ui->nonRedundantRandomizationCheckBox->isChecked();
cardsAlreadyShown.clear(); cardsAlreadyShown.clear();
cardsNotKnown.clear();
ui->nonRedundantRandomizationCheckBox->setChecked(false); ui->nonRedundantRandomizationCheckBox->setChecked(false);
cardsTotal = cardsStringList.count() + 1; cardsTotal = cardsStringList.count() + 1;
displayCard(false); displayCard(false);
@ -108,11 +101,9 @@ void flashExam::on_revealBtn_clicked()
} }
else { else {
QString answerText = displayImage(answersStringList.at(currentCardNumber)); QString answerText = displayImage(answersStringList.at(currentCardNumber));
ui->textBrowser->clear(); ui->textBrowser->setText(answerText);
ui->textBrowser->setText("<i>" + answerText + "</i>");
answerShown = true; answerShown = true;
ui->revealBtn->setText("Hide answer"); ui->revealBtn->setText("Hide answer");
ui->continueWidget->show();
} }
} }
@ -123,16 +114,6 @@ void flashExam::on_nextBtn_clicked()
} }
void flashExam::displayCard(bool existingCardNumber) { void flashExam::displayCard(bool existingCardNumber) {
if(nonRedundantRandomization) {
float cardsTotalFloat = cardsTotal * 1.0;
float cardsAlreadyShownNumber = cardsAlreadyShown.count() * 1.0;
float cardsNotKnownNumber = cardsNotKnown.count() * 1.0;
ui->cardNumberLabel->setText(QString::number(cardsAlreadyShownNumber / cardsTotalFloat * 100, 'f', 1) + "% done, " + QString::number(cardsNotKnownNumber / cardsTotalFloat * 100, 'f', 1) + "% forgotten");
}
else {
ui->cardNumberLabel->hide();
}
if(!existingCardNumber) { if(!existingCardNumber) {
if(randomize) { if(randomize) {
while(true) { while(true) {
@ -161,13 +142,11 @@ void flashExam::displayCard(bool existingCardNumber) {
} }
} }
QString cardText = displayImage(cardsStringList.at(currentCardNumber)); QString cardText = displayImage(cardsStringList.at(currentCardNumber));
ui->cardNumberLabel->setText("Card " + QString::number(currentCardNumber + 1));
ui->textBrowser->clear();
ui->textBrowser->setText(cardText); ui->textBrowser->setText(cardText);
ui->revealBtn->setText("Show answer"); ui->revealBtn->setText("Show answer");
answerShown = false; answerShown = false;
ui->continueWidget->hide();
} }
QString flashExam::displayImage(QString cardText) { QString flashExam::displayImage(QString cardText) {
@ -214,10 +193,3 @@ void flashExam::on_randomizeCheckBox_toggled(bool checked)
} }
} }
void flashExam::on_didNotKnowBtn_clicked()
{
cardsNotKnown.append(currentCardNumber);
on_nextBtn_clicked();
}

2
src/apps/flashexam.h
View file

@ -25,7 +25,6 @@ private:
bool randomize; bool randomize;
bool nonRedundantRandomization; bool nonRedundantRandomization;
QList<int> cardsAlreadyShown; QList<int> cardsAlreadyShown;
QList<int> cardsNotKnown;
bool answerShown = false; bool answerShown = false;
QStringList cardsStringList; QStringList cardsStringList;
QStringList answersStringList; QStringList answersStringList;
@ -44,7 +43,6 @@ private slots:
void on_revealBtn_clicked(); void on_revealBtn_clicked();
void on_nextBtn_clicked(); void on_nextBtn_clicked();
void on_randomizeCheckBox_toggled(bool checked); void on_randomizeCheckBox_toggled(bool checked);
void on_didNotKnowBtn_clicked();
}; };
#endif // FLASHEXAM_H #endif // FLASHEXAM_H

188
src/apps/flashexam.ui
View file

@ -93,18 +93,17 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="3"> <item row="0" column="2">
<spacer name="horizontalSpacer"> <widget class="QLabel" name="label_2">
<property name="orientation"> <property name="font">
<enum>Qt::Orientation::Horizontal</enum> <font>
<family>U001</family>
</font>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="text">
<size> <string>Select a cards list</string>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
<item row="0" column="4"> <item row="0" column="4">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
@ -121,17 +120,18 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="3">
<widget class="QLabel" name="label_2"> <spacer name="horizontalSpacer">
<property name="font"> <property name="orientation">
<font> <enum>Qt::Orientation::Horizontal</enum>
<family>U001</family>
</font>
</property> </property>
<property name="text"> <property name="sizeHint" stdset="0">
<string>Select a cards list</string> <size>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</widget> </spacer>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QPushButton" name="closeBtn"> <widget class="QPushButton" name="closeBtn">
@ -184,95 +184,6 @@
</property> </property>
<item> <item>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="2" column="0">
<widget class="QGraphicsView" name="graphicsView">
<property name="lineWidth">
<number>0</number>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QStackedWidget" name="continueWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<widget class="QWidget" name="page_3">
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout_5">
<property name="bottomMargin">
<number>0</number>
</property>
<item row="2" column="0">
<layout class="QGridLayout" name="gridLayout_6">
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QPushButton" name="didNotKnowBtn">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="nextBtn">
<property name="font">
<font>
<bold>true</bold>
</font>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<widget class="Line" name="line_3">
<property name="frameShadow">
<enum>QFrame::Shadow::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_4"/>
</widget>
</item>
<item row="7" column="0">
<widget class="QPushButton" name="revealBtn">
<property name="font">
<font>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Show answer</string>
</property>
</widget>
</item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QTextBrowser" name="textBrowser"> <widget class="QTextBrowser" name="textBrowser">
<property name="sizePolicy"> <property name="sizePolicy">
@ -283,6 +194,28 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0">
<widget class="QPushButton" name="nextBtn">
<property name="font">
<font>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Next card</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="Line" name="line_3">
<property name="frameShadow">
<enum>QFrame::Shadow::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<property name="bottomMargin"> <property name="bottomMargin">
@ -322,18 +255,8 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="4" column="0"> <item row="2" column="0">
<widget class="Line" name="line_4"> <widget class="QGraphicsView" name="graphicsView"/>
<property name="frameShadow">
<enum>QFrame::Shadow::Plain</enum>
</property>
<property name="lineWidth">
<number>2</number>
</property>
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="Line" name="line_5"> <widget class="Line" name="line_5">
@ -348,6 +271,31 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<widget class="Line" name="line_4">
<property name="frameShadow">
<enum>QFrame::Shadow::Plain</enum>
</property>
<property name="lineWidth">
<number>2</number>
</property>
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QPushButton" name="revealBtn">
<property name="font">
<font>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Show answer</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>