X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.h;h=fd6aef14c8c03de782dc02d8e1d59f30c38f357c;hb=8fa19895c8308c0a1aee537f971c740eea4bab9e;hp=cc7d160cb9097e828fdda2e5ae0d59fd02c6f583;hpb=2e3a9a7467a1740dff9985203f10f7bae01c9d0d;p=virtualjaguar

diff --git a/src/gui/mainwin.h b/src/gui/mainwin.h
index cc7d160..fd6aef1 100644
--- a/src/gui/mainwin.h
+++ b/src/gui/mainwin.h
@@ -1,7 +1,7 @@
 //
 // mainwin.h: Header file
 //
-// by James L. Hammons
+// by James Hammons
 // (C) 2010 Underground Software
 //
 
@@ -16,6 +16,7 @@ class GLWidget;
 class AboutWindow;
 class HelpWindow;
 class FilePickerWindow;
+class MemoryBrowserWindow;
 
 class MainWin: public QMainWindow
 {
@@ -23,7 +24,10 @@ class MainWin: public QMainWindow
 	Q_OBJECT
 
 	public:
-		MainWin();
+//		MainWin(QString);
+		MainWin(bool);
+		void LoadFile(QString);
+		void SyncUI(void);
 
 	protected:
 		void closeEvent(QCloseEvent *);
@@ -48,18 +52,23 @@ class MainWin: public QMainWindow
 		void Unpause(void);
 		void LoadSoftware(QString);
 		void ToggleCDUsage(void);
+		void FrameAdvance(void);
+
+		void ShowMemoryBrowserWin(void);
 
 	private:
 		void HandleKeys(QKeyEvent *, bool);
 		void ResizeMainWindow(void);
 		void ReadSettings(void);
 		void WriteSettings(void);
+		void WriteUISettings(void);
 
 //	public:
 		GLWidget * videoWidget;
 		AboutWindow * aboutWin;
 		HelpWindow * helpWin;
 		FilePickerWindow * filePickWin;
+		MemoryBrowserWindow * memBrowseWin;
 		QTimer * timer;
 		bool running;
 		int zoomLevel;
@@ -70,10 +79,16 @@ class MainWin: public QMainWindow
 		bool CDActive;
 //		bool alpineLoadSuccessful;
 		bool pauseForFileSelector;
-
+		bool loadAndGo;
+		bool keyHeld[8];
+	public:
+		bool plzDontKillMyComputer;
+	private:
 		QMenu * fileMenu;
 		QMenu * helpMenu;
+		QMenu * debugMenu;
 		QToolBar * toolbar;
+		QToolBar * debugbar;
 
 		QActionGroup * zoomActs;
 		QActionGroup * tvTypeActs;
@@ -92,6 +107,12 @@ class MainWin: public QMainWindow
 		QAction * filePickAct;
 		QAction * configAct;
 		QAction * useCDAct;
+		QAction * frameAdvanceAct;
+
+		QAction * memBrowseAct;
+
+		QIcon powerGreen;
+		QIcon powerRed;
 };
 
 #endif	// __MAINWIN_H__