From 62b541c6c09933ea0daf800ecd86467f6f15b584 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Thu, 21 Jul 2011 00:12:18 +0000 Subject: [PATCH] Added 2nd controller to config dialog. --- res/wrench.png | Bin 0 -> 6432 bytes src/gui/configdialog.cpp | 19 +++++++++++----- src/gui/configdialog.h | 3 ++- src/gui/controllertab.cpp | 46 +++++++++++++++++++++++++++++--------- src/gui/mainwin.cpp | 12 +++++----- src/gui/virtualjaguar.qrc | 1 + 6 files changed, 59 insertions(+), 22 deletions(-) create mode 100644 res/wrench.png diff --git a/res/wrench.png b/res/wrench.png new file mode 100644 index 0000000000000000000000000000000000000000..18c0cd75d324dd356d480b9ee07aa3552c0f38f6 GIT binary patch literal 6432 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, tr("General")); - tabWidget->addTab(controllerTab, tr("Controller")); + tabWidget->addTab(controllerTab1, tr("Controller #1")); + tabWidget->addTab(controllerTab2, tr("Controller #2")); if (vjs.hardwareTypeAlpine) tabWidget->addTab(alpineTab, tr("Alpine")); @@ -48,7 +50,8 @@ ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/): QDialog(parent) setWindowTitle(tr("Virtual Jaguar Settings")); LoadDialogFromSettings(); - controllerTab->UpdateLabel(); // Now it's safe to do this... ;-) + controllerTab1->UpdateLabel(); // Now it's safe to do this... ;-) + controllerTab2->UpdateLabel(); // Now it's safe to do this... ;-) } ConfigDialog::~ConfigDialog() @@ -74,7 +77,10 @@ void ConfigDialog::LoadDialogFromSettings(void) } for(int i=0; i<21; i++) - controllerTab->p1Keys[i] = vjs.p1KeyBindings[i]; + { + controllerTab1->p1Keys[i] = vjs.p1KeyBindings[i]; + controllerTab2->p1Keys[i] = vjs.p2KeyBindings[i]; + } } void ConfigDialog::UpdateVJSettings(void) @@ -96,5 +102,8 @@ void ConfigDialog::UpdateVJSettings(void) } for(int i=0; i<21; i++) - vjs.p1KeyBindings[i] = controllerTab->p1Keys[i]; + { + vjs.p1KeyBindings[i] = controllerTab1->p1Keys[i]; + vjs.p2KeyBindings[i] = controllerTab2->p1Keys[i]; + } } diff --git a/src/gui/configdialog.h b/src/gui/configdialog.h index 8c32bd3..60bc355 100644 --- a/src/gui/configdialog.h +++ b/src/gui/configdialog.h @@ -32,7 +32,8 @@ class ConfigDialog: public QDialog public: GeneralTab * generalTab; - ControllerTab * controllerTab; + ControllerTab * controllerTab1; + ControllerTab * controllerTab2; AlpineTab * alpineTab; }; diff --git a/src/gui/controllertab.cpp b/src/gui/controllertab.cpp index c3b79c9..f6d8cbc 100644 --- a/src/gui/controllertab.cpp +++ b/src/gui/controllertab.cpp @@ -34,7 +34,7 @@ char ControllerTab::keyName1[96][16] = { }; char ControllerTab::keyName2[64][16] = { - "Esc", "Tab", "BTab", "BS", "Ret", "Ent", "Ins", "Del", "Pau", "Prt", "SRq", "Clr", + "Esc", "Tab", "BTab", "BS", "Ret", "Ent", "Ins", "Del", "Pause", "Prt", "SRq", "Clr", "$C", "$D", "$E", "$F", "Hm", "End", "Lf", "Up", "Rt", "Dn", "PgU", "PgD", "$18", "$19", "$1A", "$1B", "$1C", "$1D", "$1E", "$1F", "Shf", "Ctl", "Mta", "Alt", "Cap", "Num", "ScL", "$27", "$28", "$29", "$2A", "$2B", "$2C", "$2D", "$2E", "$2F", @@ -89,30 +89,48 @@ void ControllerTab::UpdateLabel(void) { QImage controller(":/res/controller.png"); QPainter painter(&controller); + painter.setRenderHint(QPainter::Antialiasing); // Bump up the size of the default font... QFont font = painter.font(); font.setPixelSize(15); font.setBold(true); painter.setFont(font); - painter.setPen(QColor(48, 255, 255, 255)); // This is R,G,B,A +// painter.setPen(QColor(48, 255, 255, 255)); // This is R,G,B,A + painter.setPen(QColor(0, 0, 0, 255)); // This is R,G,B,A + painter.setBrush(QBrush(QColor(48, 255, 255, 255))); // This is hard-coded crap. It's crap-tastic! - int buttonPos[21][2] = { { 87, 64 }, { 87, 94 }, { 73, 78 }, { 105, 77 }, - { 125, 223 }, { 125, 199 }, { 125, 178 }, { 125, 153 }, - { 160, 223 }, { 160, 199 }, { 160, 178 }, { 160, 153 }, - { 196, 223 }, { 196, 199 }, { 196, 178 }, { 196, 153 }, - { 242, 60 }, { 225, 80 }, { 209, 104 }, { 165, 108 }, { 141, 108 } + int buttonPos[21][2] = { { 87-1, 64-5 }, { 87-1, 94 }, { 73-5, 78-2 }, { 105+3, 77-1 }, + { 125, 223 }, { 125, 200 }, { 125, 177 }, { 125, 153 }, + { 160, 223 }, { 160, 200 }, { 160, 177 }, { 160, 153 }, + { 196, 223 }, { 196, 200 }, { 196, 177 }, { 196, 153 }, + { 242, 60 }, { 225-1, 80 }, { 209-2, 104 }, { 162+2, 108-7}, { 141, 108+13 } }; + // First, draw black oversize line, then dot, then colored line + QPen blackPen(QColor(0, 0, 0, 255)); + blackPen.setWidth(4); + QPen colorPen(QColor(48, 255, 255, 255)); + colorPen.setWidth(2); + QLine line(QPoint(141, 100), QPoint(141, 108+5)); + + painter.setPen(blackPen); + painter.drawLine(line);//QPoint(141, 100), QPoint(141, 108+5)); + blackPen.setWidth(1); + painter.setPen(blackPen); + painter.drawEllipse(QPoint(141, 100), 4, 4); + painter.setPen(colorPen); + painter.drawLine(line);//QPoint(141, 100), QPoint(141, 108+5)); + for(int i=BUTTON_FIRST; i<=BUTTON_LAST; i++) { if (p1Keys[i] < 0x80) - DrawBorderedText(painter, buttonPos[i][0] - 5, buttonPos[i][1] + 5, + DrawBorderedText(painter, buttonPos[i][0] /*- 5*/, buttonPos[i][1] /*+ 5*/, QString(keyName1[p1Keys[i] - 0x20])); else if ((p1Keys[i] & 0xFFFFFF00) == 0x01000000) { - DrawBorderedText(painter, buttonPos[i][0] - 5, buttonPos[i][1] + 5, + DrawBorderedText(painter, buttonPos[i][0] /*- 5*/, buttonPos[i][1] /*+ 5*/, QString(keyName2[p1Keys[i] & 0x3F])); } else @@ -125,16 +143,22 @@ void ControllerTab::UpdateLabel(void) void ControllerTab::DrawBorderedText(QPainter & painter, int x, int y, QString text) { + // Text is drawn centered at (x, y) as well, using a bounding rect for the purpose. + QRect rect(0, 0, 60, 30); painter.setPen(QColor(0, 0, 0, 255)); // This is R,G,B,A for(int i=-1; i<=1; i++) { for(int j=-1; j<=1; j++) { - painter.drawText(QPoint(x + i, y + j), text); +// painter.drawText(QPoint(x + i, y + j), text); + rect.moveCenter(QPoint(x + i, y + j)); + painter.drawText(rect, Qt::AlignCenter, text); } } painter.setPen(QColor(48, 255, 255, 255)); // This is R,G,B,A - painter.drawText(QPoint(x, y), text); +// painter.drawText(QPoint(x, y), text); + rect.moveCenter(QPoint(x, y)); + painter.drawText(rect, Qt::AlignCenter, text); } diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp index 3cebc8a..83d0a53 100644 --- a/src/gui/mainwin.cpp +++ b/src/gui/mainwin.cpp @@ -166,7 +166,7 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit filePickAct->setShortcut(QKeySequence(tr("Ctrl+i"))); connect(filePickAct, SIGNAL(triggered()), this, SLOT(InsertCart())); - configAct = new QAction(QIcon(":/res/generic.png"), tr("&Configure"), this); + configAct = new QAction(QIcon(":/res/wrench.png"), tr("&Configure"), this); configAct->setStatusTip(tr("Configure options for Virtual Jaguar")); configAct->setShortcut(QKeySequence(tr("Ctrl+c"))); connect(configAct, SIGNAL(triggered()), this, SLOT(Configure())); @@ -183,11 +183,11 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit // Create menus & toolbars - fileMenu = menuBar()->addMenu(tr("&File")); - fileMenu->addAction(filePickAct); - fileMenu->addAction(useCDAct); + fileMenu = menuBar()->addMenu(tr("&Jaguar")); fileMenu->addAction(powerAct); fileMenu->addAction(pauseAct); + fileMenu->addAction(filePickAct); + fileMenu->addAction(useCDAct); fileMenu->addAction(configAct); fileMenu->addAction(quitAppAct); @@ -536,6 +536,8 @@ void MainWin::ShowAboutWin(void) void MainWin::InsertCart(void) { + // If the emulator is running, we pause it here and unpause it later + // if we dismiss the file selector without choosing anything if (running) { ToggleRunState(); @@ -560,7 +562,7 @@ void MainWin::LoadSoftware(QString file) running = false; // Prevent bad things(TM) from happening... pauseForFileSelector = false; // Reset the file selector pause flag SET32(jaguarMainRAM, 0, 0x00200000); // Set top of stack... - cartridgeLoaded = (JaguarLoadFile(file.toAscii().data()) ? true : false); + cartridgeLoaded = JaguarLoadFile(file.toAscii().data()); char * biosPointer = jaguarBootROM; diff --git a/src/gui/virtualjaguar.qrc b/src/gui/virtualjaguar.qrc index b5b7e08..1e2f0f7 100644 --- a/src/gui/virtualjaguar.qrc +++ b/src/gui/virtualjaguar.qrc @@ -16,6 +16,7 @@ ../../res/ntsc.png ../../res/pal.png ../../res/compact-disc.png + ../../res/wrench.png ../../res/upper-left.png ../../res/upper-right.png ../../res/alpine-file.png -- 2.37.2