Added 2nd controller to config dialog.

[virtualjaguar] / src / gui / controllertab.cpp

diff --git a/src/gui/controllertab.cpp b/src/gui/controllertab.cpp
index c3b79c9cc5d2f581a6f93533096cd8c355e2b63b..f6d8cbcb3336c9532e5639bdae27cf67411f410e 100644 (file)
--- 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);
 }