diff --git a/resources/skins/base/simulator/phone.png b/resources/skins/base/simulator/phone.png index dbfabba..37bf2c8 100644 Binary files a/resources/skins/base/simulator/phone.png and b/resources/skins/base/simulator/phone.png differ diff --git a/resources/templates/flashcard/FlashCardBar.png b/resources/templates/flashcard/FlashCardBar.png new file mode 100644 index 0000000..e6786f0 Binary files /dev/null and b/resources/templates/flashcard/FlashCardBar.png differ diff --git a/resources/templates/learnspellings/SpellingBar.png b/resources/templates/learnspellings/SpellingBar.png new file mode 100644 index 0000000..119f64a Binary files /dev/null and b/resources/templates/learnspellings/SpellingBar.png differ diff --git a/resources/templates/mlearning/MlearningBar.png b/resources/templates/mlearning/MlearningBar.png new file mode 100644 index 0000000..53f38ef Binary files /dev/null and b/resources/templates/mlearning/MlearningBar.png differ diff --git a/resources/templates/quiz/QuizBar.png b/resources/templates/quiz/QuizBar.png new file mode 100644 index 0000000..3a81cf3 Binary files /dev/null and b/resources/templates/quiz/QuizBar.png differ diff --git a/src/definitions/definitions.h.in b/src/definitions/definitions.h.in index d8de778..815a467 100755 --- a/src/definitions/definitions.h.in +++ b/src/definitions/definitions.h.in @@ -97,9 +97,9 @@ #define SIMULATOR_OFFSET 16 #define SIMULATOR_CONTENTS_OFFSET_X 30 -#define SIMULATOR_CONTENTS_OFFSET_Y 95 +#define SIMULATOR_CONTENTS_OFFSET_Y 115 #define SIMULATOR_CONTENTS_WIDTH 270 -#define SIMULATOR_CONTENTS_HEIGHT 447 +#define SIMULATOR_CONTENTS_HEIGHT 427 #define SIMULATOR_HEADER_SIZE_INCREASE 2 #define SIMULATOR_HEADING_SIZE_INCREASE 2 diff --git a/src/templates/flashcard/flashcardsimulator.cpp b/src/templates/flashcard/flashcardsimulator.cpp index b9be23e..a812335 100755 --- a/src/templates/flashcard/flashcardsimulator.cpp +++ b/src/templates/flashcard/flashcardsimulator.cpp @@ -37,6 +37,8 @@ #include "miscellaneous/application.h" #include "miscellaneous/skinfactory.h" +#include + FlashCardSimulator::FlashCardSimulator(TemplateCore *core, QWidget *parent) : TemplateSimulator(core, parent), @@ -94,6 +96,10 @@ bool FlashCardSimulator::startSimulation() { // Go to "start" page and begin. m_ui->m_phoneWidget->setCurrentIndex(1); + m_ui->m_flashcardBar->setPixmap(QPixmap(APP_TEMPLATES_PATH + QDir::separator() + + "flashcard" + QDir::separator() + + "FlashCardBar.png")); + m_ui->m_barText->setStyleSheet("background-color: rgb(221, 221, 221);color: black"); return true; } diff --git a/src/templates/flashcard/flashcardsimulator.ui b/src/templates/flashcard/flashcardsimulator.ui index 300105a..863bbb8 100755 --- a/src/templates/flashcard/flashcardsimulator.ui +++ b/src/templates/flashcard/flashcardsimulator.ui @@ -14,11 +14,52 @@ Form + + 0 + 0 + + + + + 0 + + + 0 + + + + + + + + + + + + + 0 + 0 + + + + Learn with FlashCards + + + + + + + + + 0 + 0 + + 0 diff --git a/src/templates/learnspellings/learnspellingssimulator.cpp b/src/templates/learnspellings/learnspellingssimulator.cpp index 183fbe2..c1d4c86 100755 --- a/src/templates/learnspellings/learnspellingssimulator.cpp +++ b/src/templates/learnspellings/learnspellingssimulator.cpp @@ -92,6 +92,10 @@ bool LearnSpellingsSimulator::startSimulation() { m_ui->m_lblAuthor->setText(editor->m_ui->m_txtAuthor->lineEdit()->text()); m_ui->m_lblHeading->setText(editor->m_ui->m_txtName->lineEdit()->text()); m_ui->m_phoneWidget->setCurrentIndex(1); + m_ui->m_learnspellingBar->setPixmap(QPixmap(APP_TEMPLATES_PATH + QDir::separator() + + "learnspellings" + QDir::separator() + + "SpellingBar.png")); + m_ui->m_barText->setStyleSheet("background-color: rgb(221, 221, 221);color: black"); return true; } diff --git a/src/templates/learnspellings/learnspellingssimulator.ui b/src/templates/learnspellings/learnspellingssimulator.ui index 0188cf6..71c197a 100755 --- a/src/templates/learnspellings/learnspellingssimulator.ui +++ b/src/templates/learnspellings/learnspellingssimulator.ui @@ -10,17 +10,64 @@ 300 + + + 0 + 0 + + Form - + + + 0 + 0 + + + + + 0 + + + 0 + + + + + + + + + + + + + 0 + 0 + + + + Learn Spellings + + + + + + + + + 0 + 0 + + - 0 + 3 diff --git a/src/templates/mlearning/basicmlearningsimulator.cpp b/src/templates/mlearning/basicmlearningsimulator.cpp index 593f43a..62d3d64 100755 --- a/src/templates/mlearning/basicmlearningsimulator.cpp +++ b/src/templates/mlearning/basicmlearningsimulator.cpp @@ -32,6 +32,9 @@ #include "templates/mlearning/basicmlearningeditor.h" #include "core/templatecore.h" +#include "definitions/definitions.h" + +#include BasicmLearningSimulator::BasicmLearningSimulator(TemplateCore *core, QWidget *parent) : @@ -65,6 +68,10 @@ bool BasicmLearningSimulator::startSimulation() { } m_ui->m_phoneWidget->setCurrentIndex(1); + m_ui->m_mlearningBar->setPixmap(QPixmap(APP_TEMPLATES_PATH + QDir::separator() + + "mlearning" + QDir::separator() + + "MlearningBar.png")); + m_ui->m_barText->setStyleSheet("background-color: rgb(221, 221, 221);color: black"); return true; } diff --git a/src/templates/mlearning/basicmlearningsimulator.ui b/src/templates/mlearning/basicmlearningsimulator.ui index 68bf347..a40a494 100755 --- a/src/templates/mlearning/basicmlearningsimulator.ui +++ b/src/templates/mlearning/basicmlearningsimulator.ui @@ -13,36 +13,59 @@ Form - - + + 0 - - 0 - - - 0 - - + 0 + + + + + 0 + + + 0 + + + + + + + + + + + + + 0 + 0 + + + + Basic mLearning + + + + + + + + + 0 + 0 + + 0 - - 0 - - - 0 - - - 0 - - + 0 @@ -59,16 +82,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -78,16 +92,7 @@ - - 0 - - - 0 - - - 0 - - + 0 diff --git a/src/templates/quiz/quizsimulator.cpp b/src/templates/quiz/quizsimulator.cpp index 049e23b..f63afa9 100755 --- a/src/templates/quiz/quizsimulator.cpp +++ b/src/templates/quiz/quizsimulator.cpp @@ -40,6 +40,7 @@ #include #include #include +#include QuizSimulator::QuizSimulator(TemplateCore *core, QWidget *parent) @@ -96,6 +97,10 @@ bool QuizSimulator::startSimulation() { } m_ui->m_phoneWidget->setCurrentIndex(1); + m_ui->m_quizBar->setPixmap(QPixmap(APP_TEMPLATES_PATH + QDir::separator() + + "quiz" + QDir::separator() + + "QuizBar.png")); + m_ui->m_barText->setStyleSheet("background-color: rgb(221, 221, 221);color: black"); return true; } diff --git a/src/templates/quiz/quizsimulator.ui b/src/templates/quiz/quizsimulator.ui index 47bad90..5e774e5 100755 --- a/src/templates/quiz/quizsimulator.ui +++ b/src/templates/quiz/quizsimulator.ui @@ -13,15 +13,53 @@ Form - + 0 0 + + + + + 0 + + + 0 + + + + + + + + + + + + + 0 + 0 + + + + Quiz Time + + + + + + + + + 0 + 0 + + 0