X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.h;h=c1ea616ff212ae56df4fc13017270905e00f0dd4;hb=09adab3161f986d5cc8dbeffe15cb6545afa138f;hp=781ac29fcd6ea6e2f43e724e23927374e0f1b882;hpb=5e11cea96160bd958c1b271940bf97ecfa257b15;p=virtualjaguar

diff --git a/src/gui/mainwin.h b/src/gui/mainwin.h
index 781ac29..c1ea616 100644
--- a/src/gui/mainwin.h
+++ b/src/gui/mainwin.h
@@ -12,10 +12,9 @@
 #include <QtGui>
 
 // Forward declarations
-
 class GLWidget;
-//class EditWindow;
-//class CharWindow;
+class AboutWindow;
+class FilePickerWindow;
 
 class MainWin: public QMainWindow
 {
@@ -35,26 +34,42 @@ class MainWin: public QMainWindow
 		void SetZoom100(void);
 		void SetZoom200(void);
 		void SetZoom300(void);
+		void SetNTSC(void);
+		void SetPAL(void);
 		void ToggleBlur(void);
+		void ShowAboutWin(void);
+		void InsertCart(void);
 
 	private:
+		void ResizeMainWindow(void);
 		void ReadSettings(void);
 		void WriteSettings(void);
 
 //	public:
 		GLWidget * videoWidget;
+		AboutWindow * aboutWin;
+		FilePickerWindow * filePickWin;
 		QTimer * timer;
 		bool running;
-//		EditWindow * editWnd;
-//		CharWindow * charWnd;
+		int zoomLevel;
+
+		QMenu * fileMenu;
+		QMenu * helpMenu;
+		QToolBar * toolbar;
+
 		QActionGroup * zoomActs;
+		QActionGroup * tvTypeActs;
 
-		QAction * action;
 		QAction * quitAppAct;
+		QAction * powerAct;
 		QAction * x1Act;
 		QAction * x2Act;
 		QAction * x3Act;
+		QAction * ntscAct;
+		QAction * palAct;
 		QAction * blurAct;
+		QAction * aboutAct;
+		QAction * filePickAct;
 };
 
 #endif	// __MAINWIN_H__