diff --git a/missingFunctions.txt b/missingFunctions.txt index 7dde79f..3435259 100644 --- a/missingFunctions.txt +++ b/missingFunctions.txt @@ -5,9 +5,9 @@ Nothing can be installed(theres no memory card, hotsync emulation or direct inst When running OS commands through callFunction() it can crash Only runs in debug mode because the touchscreen can only be pushed with a jump to OS function hack Holding the buttons emulates pressing them like a turbo button(may be caused by the lack of sound emulation, a sound plays on app switch and may block the CPU while waiting for the button to release) -Screenshots use window size and that makes them blurry from filtering Fixed: +Screenshots use window size and that makes them blurry from filtering State menu jitters when made too small(smallest size is now 30x40) Screen scales wrong when paused Memory is only 8mb(expected since only 1/2 the chipselect lines are emulated properly) diff --git a/qtBuildSystem/Mu/Mu.pro b/qtBuildSystem/Mu/Mu.pro index 56d0063..3ea8b1a 100644 --- a/qtBuildSystem/Mu/Mu.pro +++ b/qtBuildSystem/Mu/Mu.pro @@ -114,15 +114,6 @@ CONFIG += mobility MOBILITY = DISTFILES += \ - images/addressBook.png \ - images/center.png \ - images/down.png \ - images/left.png \ - images/notes.png \ - images/power.png \ - images/right.png \ - images/up.png \ - images/todo.png \ android/AndroidManifest.xml \ android/gradle/wrapper/gradle-wrapper.jar \ android/gradlew \ @@ -133,12 +124,23 @@ DISTFILES += \ android/res/drawable-hdpi/icon.png \ android/res/drawable-ldpi/icon.png \ android/res/drawable-mdpi/icon.png \ - images/pause.png \ - images/play.png \ - images/saveLoad.png \ - images/screenshot.png \ - images/stop.png \ - images/calendar.png + images/addressBook.svg \ + images/calendar.svg \ + images/center.svg \ + images/debugger.svg \ + images/down.svg \ + images/install.svg \ + images/left.svg \ + images/notes.svg \ + images/pause.svg \ + images/play.svg \ + images/power.svg \ + images/right.svg \ + images/screenshot.svg \ + images/stateManager.svg \ + images/stop.svg \ + images/todo.svg \ + images/up.svg RESOURCES += \ mainwindow.qrc diff --git a/qtBuildSystem/Mu/images/addressBook.png b/qtBuildSystem/Mu/images/addressBook.png deleted file mode 100644 index 372f7d9..0000000 Binary files a/qtBuildSystem/Mu/images/addressBook.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/addressBook.svg b/qtBuildSystem/Mu/images/addressBook.svg new file mode 100644 index 0000000..55ddaa3 --- /dev/null +++ b/qtBuildSystem/Mu/images/addressBook.svg @@ -0,0 +1,369 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Addess Book + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + address + contact + book + office + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/calendar.png b/qtBuildSystem/Mu/images/calendar.png deleted file mode 100644 index dab375f..0000000 Binary files a/qtBuildSystem/Mu/images/calendar.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/calendar.svg b/qtBuildSystem/Mu/images/calendar.svg new file mode 100644 index 0000000..5f1159b --- /dev/null +++ b/qtBuildSystem/Mu/images/calendar.svg @@ -0,0 +1,984 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/center.png b/qtBuildSystem/Mu/images/center.png deleted file mode 100644 index a5e5019..0000000 Binary files a/qtBuildSystem/Mu/images/center.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/center.svg b/qtBuildSystem/Mu/images/center.svg new file mode 100644 index 0000000..85bbb98 --- /dev/null +++ b/qtBuildSystem/Mu/images/center.svg @@ -0,0 +1,337 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Media Record + + + Lapo Calamandrei + + + + + + media + player + record + music + sound + video + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/debugger.svg b/qtBuildSystem/Mu/images/debugger.svg new file mode 100644 index 0000000..a499b48 --- /dev/null +++ b/qtBuildSystem/Mu/images/debugger.svg @@ -0,0 +1,750 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Edit Find + + + edit + find + locate + search + + + + + + Steven Garrity + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/down.png b/qtBuildSystem/Mu/images/down.png deleted file mode 100644 index e723276..0000000 Binary files a/qtBuildSystem/Mu/images/down.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/down.svg b/qtBuildSystem/Mu/images/down.svg new file mode 100644 index 0000000..95b82af --- /dev/null +++ b/qtBuildSystem/Mu/images/down.svg @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Go Down + + + go + lower + down + arrow + pointer + > + + + + + Andreas Nilsson + + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/hexViewer.png b/qtBuildSystem/Mu/images/hexViewer.png deleted file mode 100644 index 5594785..0000000 Binary files a/qtBuildSystem/Mu/images/hexViewer.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/install.svg b/qtBuildSystem/Mu/images/install.svg new file mode 100644 index 0000000..3200740 --- /dev/null +++ b/qtBuildSystem/Mu/images/install.svg @@ -0,0 +1,497 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + System - Installer + + + jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/left.png b/qtBuildSystem/Mu/images/left.png deleted file mode 100644 index 73d028e..0000000 Binary files a/qtBuildSystem/Mu/images/left.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/left.svg b/qtBuildSystem/Mu/images/left.svg new file mode 100644 index 0000000..d5381de --- /dev/null +++ b/qtBuildSystem/Mu/images/left.svg @@ -0,0 +1,854 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Go Previous + + + go + previous + left + arrow + pointer + < + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/notes.png b/qtBuildSystem/Mu/images/notes.png deleted file mode 100644 index 22f195b..0000000 Binary files a/qtBuildSystem/Mu/images/notes.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/notes.svg b/qtBuildSystem/Mu/images/notes.svg new file mode 100644 index 0000000..532f98b --- /dev/null +++ b/qtBuildSystem/Mu/images/notes.svg @@ -0,0 +1,548 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Generic Text + + + text + plaintext + regular + document + + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/pause.png b/qtBuildSystem/Mu/images/pause.png deleted file mode 100644 index 1e9f4d5..0000000 Binary files a/qtBuildSystem/Mu/images/pause.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/pause.svg b/qtBuildSystem/Mu/images/pause.svg new file mode 100644 index 0000000..8a434ca --- /dev/null +++ b/qtBuildSystem/Mu/images/pause.svg @@ -0,0 +1,641 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Media Playback Pause + + + Lapo Calamandrei + + + + + + media + pause + playback + video + music + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/play.png b/qtBuildSystem/Mu/images/play.png deleted file mode 100644 index 66f32d8..0000000 Binary files a/qtBuildSystem/Mu/images/play.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/play.svg b/qtBuildSystem/Mu/images/play.svg new file mode 100644 index 0000000..75616de --- /dev/null +++ b/qtBuildSystem/Mu/images/play.svg @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Media Playback Start + + + Lapo Calamandrei + + + + + + play + media + music + video + player + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/power.png b/qtBuildSystem/Mu/images/power.png deleted file mode 100644 index e0e5b26..0000000 Binary files a/qtBuildSystem/Mu/images/power.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/power.svg b/qtBuildSystem/Mu/images/power.svg new file mode 100644 index 0000000..9b0b327 --- /dev/null +++ b/qtBuildSystem/Mu/images/power.svg @@ -0,0 +1,424 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + System Shutdown + + + poweroff + shutdown + halt + system + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/right.png b/qtBuildSystem/Mu/images/right.png deleted file mode 100644 index 120e6e8..0000000 Binary files a/qtBuildSystem/Mu/images/right.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/right.svg b/qtBuildSystem/Mu/images/right.svg new file mode 100644 index 0000000..41e5990 --- /dev/null +++ b/qtBuildSystem/Mu/images/right.svg @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Go Next + + + go + next + right + arrow + pointer + > + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/saveLoad.png b/qtBuildSystem/Mu/images/saveLoad.png deleted file mode 100644 index 17b1274..0000000 Binary files a/qtBuildSystem/Mu/images/saveLoad.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/screenshot.png b/qtBuildSystem/Mu/images/screenshot.png deleted file mode 100644 index ffbffc7..0000000 Binary files a/qtBuildSystem/Mu/images/screenshot.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/screenshot.svg b/qtBuildSystem/Mu/images/screenshot.svg new file mode 100644 index 0000000..4911410 --- /dev/null +++ b/qtBuildSystem/Mu/images/screenshot.svg @@ -0,0 +1,681 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + Photo Camera + + + camera + photo + SLR + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/stateManager.svg b/qtBuildSystem/Mu/images/stateManager.svg new file mode 100644 index 0000000..6700163 --- /dev/null +++ b/qtBuildSystem/Mu/images/stateManager.svg @@ -0,0 +1,350 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Media Floppy + + + Tuomas Kuosmanen + + + http://www.tango-project.org + + + save + document + store + file + io + floppy + media + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/stop.png b/qtBuildSystem/Mu/images/stop.png deleted file mode 100644 index a094787..0000000 Binary files a/qtBuildSystem/Mu/images/stop.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/stop.svg b/qtBuildSystem/Mu/images/stop.svg new file mode 100644 index 0000000..24bbfb5 --- /dev/null +++ b/qtBuildSystem/Mu/images/stop.svg @@ -0,0 +1,651 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Media Playback Pause + + + Lapo Calamandrei + + + + + + media + stop + playback + video + music + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/todo.png b/qtBuildSystem/Mu/images/todo.png deleted file mode 100644 index bf38d98..0000000 Binary files a/qtBuildSystem/Mu/images/todo.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/todo.svg b/qtBuildSystem/Mu/images/todo.svg new file mode 100644 index 0000000..c250195 --- /dev/null +++ b/qtBuildSystem/Mu/images/todo.svg @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Justify Left + 2005-10-29 + + + Andreas Nilsson + + + + + justify + left + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/images/up.png b/qtBuildSystem/Mu/images/up.png deleted file mode 100644 index fff0d3d..0000000 Binary files a/qtBuildSystem/Mu/images/up.png and /dev/null differ diff --git a/qtBuildSystem/Mu/images/up.svg b/qtBuildSystem/Mu/images/up.svg new file mode 100644 index 0000000..54263df --- /dev/null +++ b/qtBuildSystem/Mu/images/up.svg @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Go Up + + + go + higher + up + arrow + pointer + > + + + + + Andreas Nilsson + + + + + + + + + + + + + + + + + diff --git a/qtBuildSystem/Mu/mainwindow.cpp b/qtBuildSystem/Mu/mainwindow.cpp index 8cfcaa6..8af8667 100644 --- a/qtBuildSystem/Mu/mainwindow.cpp +++ b/qtBuildSystem/Mu/mainwindow.cpp @@ -9,6 +9,8 @@ #include #include #include +#include +#include #include #include #include @@ -30,8 +32,6 @@ MainWindow::MainWindow(QWidget* parent) : //this makes the display window and button icons resize properly ui->centralWidget->installEventFilter(this); ui->centralWidget->setObjectName("centralWidget"); - //ui->displayContainer->installEventFilter(this); - //ui->displayContainer->setObjectName("displayContainer"); ui->calendar->installEventFilter(this); ui->addressBook->installEventFilter(this); @@ -46,14 +46,11 @@ MainWindow::MainWindow(QWidget* parent) : ui->power->installEventFilter(this); - ui->screenshot->installEventFilter(this); - //ui->install->installEventFilter(this);//enable when install gets an icon - //ui->stateManager->installEventFilter(this);//enable when stateManager gets an icon - ui->debugger->installEventFilter(this); - ui->ctrlBtn->installEventFilter(this); - - //ui->ctrlBtn->setIcon(QIcon(":/buttons/images/play.png")); + ui->install->installEventFilter(this); + ui->debugger->installEventFilter(this); + ui->screenshot->installEventFilter(this); + ui->stateManager->installEventFilter(this); QString resourceDirPath = settings.value("resourceDirectory", "").toString(); @@ -86,24 +83,6 @@ MainWindow::~MainWindow(){ delete ui; } -void MainWindow::createHomeDirectoryTree(QString path){ - QDir homeDir(path); - - //creates directorys if not present, does nothing if they exist already - homeDir.mkpath("."); - homeDir.mkpath("./saveStates"); - homeDir.mkpath("./screenshots"); - homeDir.mkpath("./debugDumps"); -} - -void MainWindow::popupErrorDialog(QString error){ - QMessageBox::critical(this, "Mu", error, QMessageBox::Ok); -} - -void MainWindow::popupInformationDialog(QString info){ - QMessageBox::information(this, "Mu", info, QMessageBox::Ok); -} - bool MainWindow::eventFilter(QObject *object, QEvent *event){ if(event->type() == QEvent::Resize){ if(QString(object->metaObject()->className()) == "QPushButton"){ @@ -115,8 +94,8 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event){ if(object->objectName() == "centralWidget"){ double smallestRatio; - //update displayContainer first, make the display occupy the top 3/4 of the screen - ui->displayContainer->setFixedHeight(ui->centralWidget->height() * 0.75); + //update displayContainer first, make the display occupy the top 2/3 of the screen + ui->displayContainer->setFixedHeight(ui->centralWidget->height() * 0.66); smallestRatio = qMin(ui->displayContainer->size().width() * 0.98 / 3.0 , ui->displayContainer->size().height() * 0.98 / 4.0); //the 0.98 above allows the display to shrink, without it the displayContainer couldent shrink because of the fixed size of the display @@ -135,6 +114,24 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event){ return QMainWindow::eventFilter(object, event); } +void MainWindow::createHomeDirectoryTree(QString path){ + QDir homeDir(path); + + //creates directorys if not present, does nothing if they exist already + homeDir.mkpath("."); + homeDir.mkpath("./saveStates"); + homeDir.mkpath("./screenshots"); + homeDir.mkpath("./debugDumps"); +} + +void MainWindow::popupErrorDialog(QString error){ + QMessageBox::critical(this, "Mu", error, QMessageBox::Ok); +} + +void MainWindow::popupInformationDialog(QString info){ + QMessageBox::information(this, "Mu", info, QMessageBox::Ok); +} + void MainWindow::selectHomePath(){ QString homeDirPath = QFileDialog::getOpenFileName(this, "New Home Directory(\"~/Mu\" is default)", QDir::root().path(), nullptr); @@ -142,14 +139,6 @@ void MainWindow::selectHomePath(){ settings.setValue("resourceDirectory", homeDirPath); } -void MainWindow::on_install_pressed(){ - QString app = QFileDialog::getOpenFileName(this, "Open *.prc/pdb/pqa", QDir::root().path(), nullptr); - uint32_t error = emu.installApplication(app); - - if(error != EMU_ERROR_NONE) - popupErrorDialog("Could not install app"); -} - //display void MainWindow::updateDisplay(){ if(emu.newFrameReady()){ @@ -161,7 +150,7 @@ void MainWindow::updateDisplay(){ if(emu.debugEventOccured()){ emu.clearDebugEvent(); - ui->ctrlBtn->setIcon(QIcon(":/buttons/images/play.png")); + ui->ctrlBtn->setIcon(QIcon(":/buttons/images/play.svg")); emuDebugger->exec(); } } @@ -267,7 +256,7 @@ void MainWindow::on_ctrlBtn_clicked(){ ui->stateManager->setEnabled(true); ui->debugger->setEnabled(true); - ui->ctrlBtn->setIcon(QIcon(":/buttons/images/pause.png")); + ui->ctrlBtn->setIcon(QIcon(":/buttons/images/pause.svg")); } else{ popupErrorDialog("Emu error:" + QString::number(error) + ", cant run!"); @@ -275,16 +264,26 @@ void MainWindow::on_ctrlBtn_clicked(){ } else if(emu.isRunning()){ emu.pause(); - ui->ctrlBtn->setIcon(QIcon(":/buttons/images/play.png")); + ui->ctrlBtn->setIcon(QIcon(":/buttons/images/play.svg")); } else if(emu.isPaused()){ emu.resume(); - ui->ctrlBtn->setIcon(QIcon(":/buttons/images/pause.png")); + ui->ctrlBtn->setIcon(QIcon(":/buttons/images/pause.svg")); } ui->ctrlBtn->repaint();//Qt 5.11 broke icon changes on click, this is a patch } +void MainWindow::on_install_pressed(){ + if(emu.isInited()){ + QString app = QFileDialog::getOpenFileName(this, "Open *.prc/pdb/pqa", QDir::root().path(), nullptr); + uint32_t error = emu.installApplication(app); + + if(error != EMU_ERROR_NONE) + popupErrorDialog("Could not install app"); + } +} + void MainWindow::on_debugger_clicked(){ if(emu.isInited()){ emu.pause(); diff --git a/qtBuildSystem/Mu/mainwindow.h b/qtBuildSystem/Mu/mainwindow.h index f1e3208..0a58d58 100644 --- a/qtBuildSystem/Mu/mainwindow.h +++ b/qtBuildSystem/Mu/mainwindow.h @@ -2,6 +2,10 @@ #include #include +#include +#include +#include +#include #include #include "emuwrapper.h" @@ -26,11 +30,10 @@ private: void createHomeDirectoryTree(QString path); private slots: + bool eventFilter(QObject* object, QEvent* event); void popupErrorDialog(QString error); void popupInformationDialog(QString info); - bool eventFilter(QObject* object, QEvent* event); void selectHomePath(); - void on_install_pressed(); //display void updateDisplay(); @@ -57,6 +60,7 @@ private slots: //frontend buttons void on_ctrlBtn_clicked(); + void on_install_pressed(); void on_debugger_clicked(); void on_screenshot_clicked(); void on_stateManager_clicked(); diff --git a/qtBuildSystem/Mu/mainwindow.qrc b/qtBuildSystem/Mu/mainwindow.qrc index 0a5536d..00f1701 100644 --- a/qtBuildSystem/Mu/mainwindow.qrc +++ b/qtBuildSystem/Mu/mainwindow.qrc @@ -1,20 +1,21 @@ - images/addressBook.png - images/center.png - images/down.png - images/left.png - images/notes.png - images/power.png - images/right.png - images/todo.png - images/up.png - images/pause.png - images/play.png - images/saveLoad.png - images/screenshot.png - images/stop.png - images/hexViewer.png - images/calendar.png + images/addressBook.svg + images/calendar.svg + images/center.svg + images/debugger.svg + images/down.svg + images/install.svg + images/left.svg + images/notes.svg + images/pause.svg + images/play.svg + images/power.svg + images/right.svg + images/screenshot.svg + images/stateManager.svg + images/stop.svg + images/todo.svg + images/up.svg diff --git a/qtBuildSystem/Mu/mainwindow.ui b/qtBuildSystem/Mu/mainwindow.ui index efabd40..e3cbda3 100644 --- a/qtBuildSystem/Mu/mainwindow.ui +++ b/qtBuildSystem/Mu/mainwindow.ui @@ -113,7 +113,7 @@ - :/buttons/images/calendar.png:/buttons/images/calendar.png + :/buttons/images/calendar.svg:/buttons/images/calendar.svg @@ -130,7 +130,7 @@ - :/buttons/images/down.png:/buttons/images/down.png + :/buttons/images/down.svg:/buttons/images/down.svg @@ -147,7 +147,7 @@ - :/buttons/images/up.png:/buttons/images/up.png + :/buttons/images/up.svg:/buttons/images/up.svg @@ -164,7 +164,7 @@ - :/buttons/images/addressBook.png:/buttons/images/addressBook.png + :/buttons/images/addressBook.svg:/buttons/images/addressBook.svg @@ -181,7 +181,7 @@ - :/buttons/images/right.png:/buttons/images/right.png + :/buttons/images/right.svg:/buttons/images/right.svg @@ -198,7 +198,7 @@ - :/buttons/images/center.png:/buttons/images/center.png + :/buttons/images/center.svg:/buttons/images/center.svg @@ -227,7 +227,7 @@ - :/buttons/images/todo.png:/buttons/images/todo.png + :/buttons/images/todo.svg:/buttons/images/todo.svg @@ -244,7 +244,7 @@ - :/buttons/images/power.png:/buttons/images/power.png + :/buttons/images/power.svg:/buttons/images/power.svg @@ -261,7 +261,7 @@ - :/buttons/images/notes.png:/buttons/images/notes.png + :/buttons/images/notes.svg:/buttons/images/notes.svg @@ -278,7 +278,7 @@ - :/buttons/images/left.png:/buttons/images/left.png + :/buttons/images/left.svg:/buttons/images/left.svg @@ -295,7 +295,7 @@ - :/buttons/images/play.png:/buttons/images/play.png + :/buttons/images/play.svg:/buttons/images/play.svg @@ -312,7 +312,7 @@ - :/buttons/images/screenshot.png:/buttons/images/screenshot.png + :/buttons/images/screenshot.svg:/buttons/images/screenshot.svg @@ -329,7 +329,7 @@ - :/buttons/images/hexViewer.png:/buttons/images/hexViewer.png + :/buttons/images/debugger.svg:/buttons/images/debugger.svg @@ -344,8 +344,9 @@ 0 - - Install + + + :/buttons/images/install.svg:/buttons/images/install.svg @@ -374,7 +375,11 @@ - State Mgr + + + + + :/buttons/images/stateManager.svg:/buttons/images/stateManager.svg @@ -389,7 +394,7 @@ TouchScreen QLabel -
touchscreen.h
+
touchscreen.h
diff --git a/qtBuildSystem/Mu/statemanager.cpp b/qtBuildSystem/Mu/statemanager.cpp index 1552a29..e456622 100644 --- a/qtBuildSystem/Mu/statemanager.cpp +++ b/qtBuildSystem/Mu/statemanager.cpp @@ -3,6 +3,8 @@ #include #include +#include +#include #include #include diff --git a/qtBuildSystem/Mu/statemanager.h b/qtBuildSystem/Mu/statemanager.h index 3cf724b0..79a094b 100644 --- a/qtBuildSystem/Mu/statemanager.h +++ b/qtBuildSystem/Mu/statemanager.h @@ -1,6 +1,8 @@ #pragma once #include +#include +#include #include namespace Ui{ diff --git a/qtBuildSystem/Mu/touchscreen.cpp b/qtBuildSystem/Mu/touchscreen.cpp index 8302e27..cb1b444 100644 --- a/qtBuildSystem/Mu/touchscreen.cpp +++ b/qtBuildSystem/Mu/touchscreen.cpp @@ -1,3 +1,5 @@ +#include + #include #include "touchscreen.h" diff --git a/qtBuildSystem/Mu/touchscreen.h b/qtBuildSystem/Mu/touchscreen.h index 3381124..de88750 100644 --- a/qtBuildSystem/Mu/touchscreen.h +++ b/qtBuildSystem/Mu/touchscreen.h @@ -2,7 +2,7 @@ #include #include -#include +//#include class TouchScreen : public QLabel{ Q_OBJECT diff --git a/qtBuildSystem/icons/clean3d-blue.zip b/qtBuildSystem/icons/clean3d-blue.zip deleted file mode 100644 index 08c5b13..0000000 Binary files a/qtBuildSystem/icons/clean3d-blue.zip and /dev/null differ diff --git a/qtBuildSystem/icons/gnomeTango/camera-photo.png b/qtBuildSystem/icons/gnomeTango/camera-photo.png deleted file mode 100644 index ffbffc7..0000000 Binary files a/qtBuildSystem/icons/gnomeTango/camera-photo.png and /dev/null differ diff --git a/qtBuildSystem/icons/gnomeTango/edit-find.png b/qtBuildSystem/icons/gnomeTango/edit-find.png deleted file mode 100644 index 5594785..0000000 Binary files a/qtBuildSystem/icons/gnomeTango/edit-find.png and /dev/null differ diff --git a/qtBuildSystem/icons/gnomeTango/media-floppy.png b/qtBuildSystem/icons/gnomeTango/media-floppy.png deleted file mode 100644 index 17b1274..0000000 Binary files a/qtBuildSystem/icons/gnomeTango/media-floppy.png and /dev/null differ diff --git a/qtBuildSystem/icons/gnomeTango/media-playback-pause.png b/qtBuildSystem/icons/gnomeTango/media-playback-pause.png deleted file mode 100644 index 1e9f4d5..0000000 Binary files a/qtBuildSystem/icons/gnomeTango/media-playback-pause.png and /dev/null differ diff --git a/qtBuildSystem/icons/gnomeTango/media-playback-start.png b/qtBuildSystem/icons/gnomeTango/media-playback-start.png deleted file mode 100644 index 66f32d8..0000000 Binary files a/qtBuildSystem/icons/gnomeTango/media-playback-start.png and /dev/null differ diff --git a/qtBuildSystem/icons/gnomeTango/media-playback-stop.png b/qtBuildSystem/icons/gnomeTango/media-playback-stop.png deleted file mode 100644 index a094787..0000000 Binary files a/qtBuildSystem/icons/gnomeTango/media-playback-stop.png and /dev/null differ diff --git a/qtBuildSystem/icons/gnomeTango/utilities-terminal.png b/qtBuildSystem/icons/gnomeTango/utilities-terminal.png deleted file mode 100644 index f86c784..0000000 Binary files a/qtBuildSystem/icons/gnomeTango/utilities-terminal.png and /dev/null differ diff --git a/unimplementedHardware.txt b/unimplementedHardware.txt index 997d244..5c0beed 100644 --- a/unimplementedHardware.txt +++ b/unimplementedHardware.txt @@ -1,7 +1,3 @@ -Emulator wrapper: -add 320*320 frame buffer silkscreen, 2xBRZ should be able to make 320*320 version of the 160*160 silkscreen -Tango icons don't grow enough with a big window - CPU: sysTrapPceNativeCall, ARM Emulator CPU32 table lookup opcodes @@ -61,6 +57,8 @@ Channels 3 and 4(they need to be scaled differently) Fixed: +add 320*320 frame buffer silkscreen, 2xBRZ should be able to make 320*320 version of the 160*160 silkscreen(not hooked up but one has been created) +Tango icons don't grow enough with a big window a reset caused by the watchdog may cause undefined behavior(it just resets, same as if a reset opcode where called) CSD and CSC chaining to create a 16mb address space from 4x4mb chunks(this is just completely wrong, the address lines are controlled by the DRAM module that was unemulated) RAM wait states(not happening)