X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=7b7a2de3e21735497d76b7164a071566e6f5e783;hb=caf1236884015695c52910a75b8420be7c63d574;hp=5aae995359e54042e37fbbd32b7fa735dd0be80a;hpb=7611a21d2b36def66216598617d647acfc657e3e;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 5aae995..7b7a2de 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -92,12 +92,12 @@ MainWin::MainWin()
 	tvTypeActs = new QActionGroup(this);
 
 	ntscAct = new QAction(QIcon(":/res/generic.png"), tr("NTSC"), tvTypeActs);
-	ntscAct->setStatusTip(tr("Sets OpenGL rendering to GL_NEAREST"));
+	ntscAct->setStatusTip(tr("Sets Jaguar to NTSC mode"));
 	ntscAct->setCheckable(true);
 	connect(ntscAct, SIGNAL(triggered()), this, SLOT(SetNTSC()));
 
 	palAct = new QAction(QIcon(":/res/generic.png"), tr("PAL"), tvTypeActs);
-	palAct->setStatusTip(tr("Sets OpenGL rendering to GL_NEAREST"));
+	palAct->setStatusTip(tr("Sets Jaguar to PAL mode"));
 	palAct->setCheckable(true);
 	connect(palAct, SIGNAL(triggered()), this, SLOT(SetPAL()));
 
@@ -110,7 +110,7 @@ MainWin::MainWin()
 	aboutAct->setStatusTip(tr("Blatant self-promotion"));
 	connect(aboutAct, SIGNAL(triggered()), this, SLOT(ShowAboutWin()));
 
-	filePickAct = new QAction(QIcon(":/res/generic.png"), tr("Insert Cartridge..."), this);
+	filePickAct = new QAction(QIcon(":/res/generic.png"), tr("&Insert Cartridge..."), this);
 	filePickAct->setStatusTip(tr("Insert a cartridge into Virtual Jaguar"));
 	connect(filePickAct, SIGNAL(triggered()), this, SLOT(InsertCart()));
 
@@ -121,22 +121,25 @@ MainWin::MainWin()
 	fileMenu->addAction(powerAct);
 	fileMenu->addAction(quitAppAct);
 
-	fileMenu = menuBar()->addMenu(tr("&Help"));
-	fileMenu->addAction(aboutAct);
+	helpMenu = menuBar()->addMenu(tr("&Help"));
+	helpMenu->addAction(aboutAct);
 
-	QToolBar * toolbar = addToolBar(tr("Stuff"));
+	toolbar = addToolBar(tr("Stuff"));
 	toolbar->addAction(powerAct);
+	toolbar->addSeparator();
 	toolbar->addAction(x1Act);
 	toolbar->addAction(x2Act);
 	toolbar->addAction(x3Act);
+	toolbar->addSeparator();
 	toolbar->addAction(ntscAct);
 	toolbar->addAction(palAct);
+	toolbar->addSeparator();
 	toolbar->addAction(blurAct);
 
 	//	Create status bar
 	statusBar()->showMessage(tr("Ready"));
 
-	// Set toolbar button based on setting read in (sync the UI)...
+	// Set toolbar buttons/menus based on settings read in (sync the UI)...
 	blurAct->setChecked(vjs.glFilter);
 	x1Act->setChecked(zoomLevel == 1);
 	x2Act->setChecked(zoomLevel == 2);
@@ -278,7 +281,8 @@ void MainWin::ReadSettings(void)
 	vjs.renderType       = settings.value("renderType", 0).toInt();
 
 	// Hardcoded, !!! FIX !!!
-	strcpy(vjs.ROMPath, "./roms");
+#warning "!!! FIX !!! ROMPath is hardcoded!"
+	strcpy(vjs.ROMPath, "./software");
 }
 
 void MainWin::WriteSettings(void)