From: Shamus Hammons Date: Thu, 21 Jul 2011 00:12:18 +0000 (+0000) Subject: Added 2nd controller to config dialog. X-Git-Tag: 2.0.0~11 X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62b541c6c09933ea0daf800ecd86467f6f15b584;p=virtualjaguar Added 2nd controller to config dialog. --- diff --git a/res/wrench.png b/res/wrench.png new file mode 100644 index 0000000..18c0cd7 Binary files /dev/null and b/res/wrench.png differ diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp index 23b2008..4107e6b 100644 --- a/src/gui/configdialog.cpp +++ b/src/gui/configdialog.cpp @@ -24,13 +24,15 @@ ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/): QDialog(parent) { tabWidget = new QTabWidget; generalTab = new GeneralTab(this); - controllerTab = new ControllerTab(this); + controllerTab1 = new ControllerTab(this); + controllerTab2 = new ControllerTab(this); if (vjs.hardwareTypeAlpine) alpineTab = new AlpineTab(this); tabWidget->addTab(generalTab, 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