diff --git a/qtBuildSystem/Mu/Mu.pro b/qtBuildSystem/Mu/Mu.pro index a463046..084cfc2 100644 --- a/qtBuildSystem/Mu/Mu.pro +++ b/qtBuildSystem/Mu/Mu.pro @@ -79,3 +79,17 @@ FORMS += \ CONFIG += mobility c++11 MOBILITY = +DISTFILES += \ + images/addressBook.png \ + images/calender.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 + +RESOURCES += \ + mainwindow.qrc diff --git a/qtBuildSystem/Mu/Mu.pro.user b/qtBuildSystem/Mu/Mu.pro.user index c61f383..b3724ac 100644 --- a/qtBuildSystem/Mu/Mu.pro.user +++ b/qtBuildSystem/Mu/Mu.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/qtBuildSystem/icons/addressBook.png b/qtBuildSystem/Mu/images/addressBook.png similarity index 100% rename from qtBuildSystem/icons/addressBook.png rename to qtBuildSystem/Mu/images/addressBook.png diff --git a/qtBuildSystem/icons/calender.png b/qtBuildSystem/Mu/images/calender.png similarity index 100% rename from qtBuildSystem/icons/calender.png rename to qtBuildSystem/Mu/images/calender.png diff --git a/qtBuildSystem/icons/center.png b/qtBuildSystem/Mu/images/center.png similarity index 100% rename from qtBuildSystem/icons/center.png rename to qtBuildSystem/Mu/images/center.png diff --git a/qtBuildSystem/icons/down.png b/qtBuildSystem/Mu/images/down.png similarity index 100% rename from qtBuildSystem/icons/down.png rename to qtBuildSystem/Mu/images/down.png diff --git a/qtBuildSystem/icons/left.png b/qtBuildSystem/Mu/images/left.png similarity index 100% rename from qtBuildSystem/icons/left.png rename to qtBuildSystem/Mu/images/left.png diff --git a/qtBuildSystem/icons/notes.png b/qtBuildSystem/Mu/images/notes.png similarity index 100% rename from qtBuildSystem/icons/notes.png rename to qtBuildSystem/Mu/images/notes.png diff --git a/qtBuildSystem/icons/power.png b/qtBuildSystem/Mu/images/power.png similarity index 100% rename from qtBuildSystem/icons/power.png rename to qtBuildSystem/Mu/images/power.png diff --git a/qtBuildSystem/icons/right.png b/qtBuildSystem/Mu/images/right.png similarity index 100% rename from qtBuildSystem/icons/right.png rename to qtBuildSystem/Mu/images/right.png diff --git a/qtBuildSystem/icons/toDo.png b/qtBuildSystem/Mu/images/todo.png similarity index 100% rename from qtBuildSystem/icons/toDo.png rename to qtBuildSystem/Mu/images/todo.png diff --git a/qtBuildSystem/icons/up.png b/qtBuildSystem/Mu/images/up.png similarity index 100% rename from qtBuildSystem/icons/up.png rename to qtBuildSystem/Mu/images/up.png diff --git a/qtBuildSystem/Mu/mainwindow.cpp b/qtBuildSystem/Mu/mainwindow.cpp index 71d57e7..e867a38 100644 --- a/qtBuildSystem/Mu/mainwindow.cpp +++ b/qtBuildSystem/Mu/mainwindow.cpp @@ -29,6 +29,18 @@ static std::atomic emuOn; static std::atomic emuInited; static uint8_t romBuffer[ROM_SIZE]; +/* +static QIcon calenderIcon(":/images/calender.png"); +static QIcon addressBookIcon(":/images/addressBook.png"); +static QIcon todoIcon(":/images/todo.png"); +static QIcon notesIcon(":/images/notes.png"); +static QIcon upIcon(":/images/up.png"); +static QIcon downIcon(":/images/down.png"); +static QIcon leftIcon(":/images/left.png"); +static QIcon rightIcon(":/images/right.png"); +static QIcon centerIcon(":/images/center.png"); +*/ + void popupErrorDialog(std::string error){ //add error dialog code @@ -85,6 +97,10 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWindow){ ui->setupUi(this); + + //ui->addressBook->installEventFilter(this); + //ui->addressBook->eventFilter = resizeButtonIcons; + emuOn = false; emuInited = false; screenWidth = 160; @@ -107,6 +123,14 @@ MainWindow::~MainWindow(){ delete ui; } +bool MainWindow::eventFilter(QObject *object, QEvent *event){ + if(std::string(object->metaObject()->className()) == "QPushButton" && event->type() == QEvent::Resize){ + QPushButton* button = (QPushButton*)object; + button->setIconSize(button->size()); + } + + return QMainWindow::eventFilter(object, event); +} void MainWindow::loadRom(){ std::string rom = settings.value("romPath", "").toString().toStdString(); diff --git a/qtBuildSystem/Mu/mainwindow.h b/qtBuildSystem/Mu/mainwindow.h index 7ead064..b65a16e 100644 --- a/qtBuildSystem/Mu/mainwindow.h +++ b/qtBuildSystem/Mu/mainwindow.h @@ -31,6 +31,7 @@ public: ~MainWindow(); private slots: + bool eventFilter(QObject *object, QEvent *event); void loadRom(); void selectRom(); void on_install_pressed(); diff --git a/qtBuildSystem/Mu/mainwindow.qrc b/qtBuildSystem/Mu/mainwindow.qrc new file mode 100644 index 0000000..7ab1d94 --- /dev/null +++ b/qtBuildSystem/Mu/mainwindow.qrc @@ -0,0 +1,14 @@ + + + images/addressBook.png + images/calender.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 + + diff --git a/qtBuildSystem/Mu/mainwindow.ui b/qtBuildSystem/Mu/mainwindow.ui index a5d6e64..de6cbb5 100644 --- a/qtBuildSystem/Mu/mainwindow.ui +++ b/qtBuildSystem/Mu/mainwindow.ui @@ -6,7 +6,7 @@ 0 0 - 525 + 574 678 @@ -43,8 +43,8 @@ - 0 - 0 + 320 + 320 @@ -89,7 +89,112 @@ - + + + + + 0 + 0 + + + + + + + + :/buttons/images/center.png:/buttons/images/center.png + + + + 75 + 75 + + + + + + + + + 0 + 0 + + + + ctrl_btn + + + + + + + + 0 + 0 + + + + + + + + :/buttons/images/right.png:/buttons/images/right.png + + + + 75 + 75 + + + + + + + + + 0 + 0 + + + + + + + + :/buttons/images/calender.png:/buttons/images/calender.png + + + + 75 + 75 + + + + + + + + + 0 + 0 + + + + + + + + :/buttons/images/addressBook.png:/buttons/images/addressBook.png + + + + 75 + 75 + + + + + @@ -110,12 +215,16 @@ - Td + + + + + :/buttons/images/toDo.png:/buttons/images/toDo.png - 30 - 30 + 75 + 75 @@ -129,8 +238,8 @@ - - + + 0 @@ -138,12 +247,62 @@ - Phn + + + + + :/buttons/images/notes.png:/buttons/images/notes.png - 30 - 30 + 75 + 75 + + + + + + + + + 0 + 0 + + + + + + + + :/buttons/images/left.png:/buttons/images/left.png + + + + 75 + 75 + + + + + + + + + 0 + 0 + + + + + + + + :/buttons/images/power.png:/buttons/images/power.png + + + + 75 + 75 @@ -161,38 +320,6 @@ - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - Clk - - - - 30 - 30 - - - - @@ -206,8 +333,8 @@ - - + + 0 @@ -217,9 +344,32 @@ + + + :/buttons/images/down.png:/buttons/images/down.png + + + + 75 + 75 + + - + + + + Qt::Vertical + + + + 20 + 40 + + + + + @@ -230,79 +380,18 @@ - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - Nts + + + :/buttons/images/up.png:/buttons/images/up.png - 30 - 30 + 75 + 75 - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - Power - - - - - - - - 0 - 0 - - - - ctrl_btn - - - @@ -399,6 +488,8 @@
touchscreen.h
- + + + diff --git a/qtBuildSystem/icons/credit.txt b/qtBuildSystem/icons/credit.txt index 4d90fc5..e11f2d5 100644 --- a/qtBuildSystem/icons/credit.txt +++ b/qtBuildSystem/icons/credit.txt @@ -1,7 +1,9 @@ These icons were made by: http://icons.mysitemyway.com/ +http://www.iconarchive.com/artist/everaldo.html I got them here: http://www.iconarchive.com/show/clean-3d-icons-by-mysitemyway.html +http://www.iconarchive.com/show/crystal-clear-icons-by-everaldo/App-palm-icon.html I take no credit for these icons. \ No newline at end of file diff --git a/qtBuildSystem/icons/desktopIcons/palm128.png b/qtBuildSystem/icons/desktopIcons/palm128.png new file mode 100644 index 0000000..fb2bb87 Binary files /dev/null and b/qtBuildSystem/icons/desktopIcons/palm128.png differ diff --git a/qtBuildSystem/icons/desktopIcons/palm16.png b/qtBuildSystem/icons/desktopIcons/palm16.png new file mode 100644 index 0000000..47095e8 Binary files /dev/null and b/qtBuildSystem/icons/desktopIcons/palm16.png differ diff --git a/qtBuildSystem/icons/desktopIcons/palm24.png b/qtBuildSystem/icons/desktopIcons/palm24.png new file mode 100644 index 0000000..1504634 Binary files /dev/null and b/qtBuildSystem/icons/desktopIcons/palm24.png differ diff --git a/qtBuildSystem/icons/desktopIcons/palm32.png b/qtBuildSystem/icons/desktopIcons/palm32.png new file mode 100644 index 0000000..ae7fef2 Binary files /dev/null and b/qtBuildSystem/icons/desktopIcons/palm32.png differ diff --git a/qtBuildSystem/icons/desktopIcons/palm48.png b/qtBuildSystem/icons/desktopIcons/palm48.png new file mode 100644 index 0000000..9556cb4 Binary files /dev/null and b/qtBuildSystem/icons/desktopIcons/palm48.png differ diff --git a/qtBuildSystem/icons/desktopIcons/palm64.png b/qtBuildSystem/icons/desktopIcons/palm64.png new file mode 100644 index 0000000..483602a Binary files /dev/null and b/qtBuildSystem/icons/desktopIcons/palm64.png differ diff --git a/qtBuildSystem/icons/desktopIcons/palm72.png b/qtBuildSystem/icons/desktopIcons/palm72.png new file mode 100644 index 0000000..2d9fde3 Binary files /dev/null and b/qtBuildSystem/icons/desktopIcons/palm72.png differ diff --git a/qtBuildSystem/icons/desktopIcons/palm96.png b/qtBuildSystem/icons/desktopIcons/palm96.png new file mode 100644 index 0000000..4615b25 Binary files /dev/null and b/qtBuildSystem/icons/desktopIcons/palm96.png differ diff --git a/readme.md b/readme.md index 81bb057..c5eb3ce 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# Palm m515/OS 4.1 emulator(Mu) +# Palm m515/OS 4.1 emulator(Mu) This is a complete restart of my Palm OS emulator, with the last one the code got too messy and the goal too ambitious(to emulate every palm API in software and for compatibility with all Palm OS versions and devices). @@ -47,8 +47,9 @@ Bonus: Has Adware(Addit) The lack of ARM CPU will be fixed in my emulator see "OS improvements". ## Credits -Musashi v3.4(last version that builds outside of mame) (68k core) -http://www.iconarchive.com/show/clean-3d-icons-by-mysitemyway.html (Qt Button Icons) +Musashi v3.4(last version that builds outside of mame) (68k core) +http://www.iconarchive.com/show/clean-3d-icons-by-mysitemyway.html (Qt Button Icons) +http://www.iconarchive.com/show/crystal-clear-icons-by-everaldo/App-palm-icon.html (Desktop Icon) ## Building #### For RetroArch