X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=emul%2Femulwin.cpp;h=8182986430e739e42e03fde514b2b2b036f739c6;hb=7e9607da051e41d0cae09af10068b2a45e887b39;hp=f03fc06c49aa3343eb656f8b750e263f6c961b7e;hpb=669ef4744ad8c96dbd79e2bd8613bddf1121511f;p=bertos.git

diff --git a/emul/emulwin.cpp b/emul/emulwin.cpp
index f03fc06c..81829864 100755
--- a/emul/emulwin.cpp
+++ b/emul/emulwin.cpp
@@ -15,6 +15,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.6  2006/09/19 17:49:04  bernie
+ *#* Reindent.
+ *#*
+ *#* Revision 1.5  2006/05/28 12:17:56  bernie
+ *#* Drop almost all the Qt3 cruft.
+ *#*
+ *#* Revision 1.4  2006/02/20 02:00:39  bernie
+ *#* Port to Qt 4.1.
+ *#*
+ *#* Revision 1.3  2006/02/15 09:11:17  bernie
+ *#* Add keyboard emulator.
+ *#*
  *#* Revision 1.2  2006/01/16 03:51:51  bernie
  *#* Fix boilerplate.
  *#*
@@ -27,48 +39,64 @@
 
 #include <drv/lcd_gfx_qt.h>
 #include <emul/emul.h>
+#include <emul/emulkbd.h>
 
 #include <cassert>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qslider.h>
-#include <qcheckbox.h>
-#include <qpopupmenu.h>
-#include <qmenubar.h>
-#include <qmessagebox.h>
-#include <qdatetime.h>
-#include <qtimer.h>
-#include <qapplication.h>
-
-EmulWin::EmulWin(Emulator *e) : QMainWindow(0, "SarfEmul", WDestructiveClose)
+
+#include <QtGui/QLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QSlider>
+#include <QtGui/QCheckBox>
+#include <QtGui/QMenuBar>
+#include <QtGui/QMessageBox>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
+#include <QtGui/QApplication>
+#include <QtGui/QCloseEvent>
+using namespace Qt;
+
+EmulWin::EmulWin(Emulator *e)
 {
-	// "File" menu
-	QPopupMenu * file = new QPopupMenu(this);
-	file->insertItem("&Quit", static_cast<QObject *>(e->emulApp), SLOT(closeAllWindows()), CTRL+Key_Q);
+	setWindowTitle(tr("DevLib Emul Demo"));
+	setAttribute(Qt::WA_DeleteOnClose);
+
+	// Create the menu bar
+	QMenu *file_menu = menuBar()->addMenu(tr("&File"));
+	file_menu->addAction(tr("&Quit"),
+		e->emulApp, SLOT(closeAllWindows()), CTRL+Key_Q);
 
-	// "Help" menu
-	QPopupMenu * help = new QPopupMenu(this);
-	help->insertItem("&About", this, SLOT(about()), Key_F1);
+	menuBar()->addSeparator();
 
-	// Menu bar
-	QMenuBar * menu = new QMenuBar(this);
-	menu->insertItem("&File", file);
-	menu->insertSeparator();
-	menu->insertItem("&Help", help);
+	QMenu *help_menu = menuBar()->addMenu(tr("&Help"));
+	help_menu->addAction(tr("&About"),
+		this, SLOT(about()), Key_F1);
 
 	// Make a central widget to contain the other widgets
 	QWidget *central = new QWidget(this);
 	setCentralWidget(central);
 
 	// Create a layout to position the widgets
-	QHBoxLayout *box_main = new QHBoxLayout(central, 4);
+	QHBoxLayout *box_main = new QHBoxLayout(central);
 
 	// Main layout
-	QVBoxLayout *box_right = new QVBoxLayout(box_main, 4);
+	QVBoxLayout *box_right = new QVBoxLayout();
+	box_main->addLayout(box_right);
 
 		// LCD
-		QHBoxLayout *lay_lcd = new QHBoxLayout(box_right, 4);
-		lay_lcd->addWidget(e->emulLCD = new EmulLCD(central));
+		QHBoxLayout *lay_lcd = new QHBoxLayout();
+		box_right->addLayout(lay_lcd);
+			lay_lcd->addStretch();
+			lay_lcd->addWidget(e->emulLCD = new EmulLCD(central));
+			lay_lcd->addStretch();
+
+		// Keyboard
+		box_right->addWidget(e->emulKbd = new EmulKbd(central));
+
+	// Setup keyboard: Label   Keycode     Row Col MRow MCol
+	e->emulKbd->addKey("^",    Key_Up,     0,  0,  0,   0);
+	e->emulKbd->addKey("v",    Key_Down,   1,  0,  0,   1);
+	e->emulKbd->addKey("OK",   Key_Return, 0,  1,  0,   2);
+	e->emulKbd->addKey("ESC",  Key_Escape, 1,  1,  0,   3);
 }