ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/Vago/mainwindow.h

Comparing Vago/trunk/Vago/mainwindow.h (file contents):
Revision 792 by s10k, Sat Apr 6 23:10:19 2013 UTC vs.
Revision 811 by s10k, Sat Apr 13 12:15:20 2013 UTC

#	Line 7 | Line 7
7		#include "about.h"
8		#include "packagewizard.h"
9		#include "soundwizard.h"
10	+	#include "converter.h"
11	+	#include "droptablewidget.h"
12
13		#include <QMainWindow>
14		#include <QSettings>
#	Line 19 | Line 21
21		#include <QDesktopServices>
22		#include <QErrorMessage>
23		#include <QTextCodec>
22	–	#include <converter.h>
24		#include <QProgressBar>
24	–	#include <droptablewidget.h>
25		#include <QComboBox>
26		#include <QtNetwork/QNetworkAccessManager>
27		#include <QtNetwork/QNetworkRequest>
28		#include <QtNetwork/QNetworkReply>
29	–	#include <QDebug>
29		#include <QCloseEvent>
30		#include <QScriptEngine>
31		#include <QScriptValueIterator>
32	+	//#include <QDebug>
33
34		namespace Ui {
35		class MainWindow;
#	Line 45 | Line 45 | public:
45		~MainWindow();
46
47		protected:
48	<	void closeEvent(QCloseEvent *event);
48	>	void closeEvent(QCloseEvent *event);
49
50		private slots:
51		void on_actionExit_triggered();
#	Line 185 | Line 185 | private slots:
185		private:
186		Ui::MainWindow *ui;
187		Logger *myLogger;
188	+	QString AppDir;
189		QString workspaceLocation; //Workspace location
190		QString workspaceWizardsLocation; //Workspace wizard location
191		QString outputFolder; //Output folder
#	Line 219 | Line 220 | private:
220		QString fileParsingMisc(QString myOutputFolder, QString from, QString to , QString file);
221		QString getCommand(DropTableWidget* myTable, QString myOutputFolder, QString from, QString to , QString file);
222		QString getTypeConversion(DropTableWidget *myTable); //get the current type for a table
223	+	QString getOSIndependentAppPath();
224		};
225
226		#endif // MAINWINDOW_H

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)