X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2FDialog_MainWindow.h;h=9e572640937918edf149ff769bb76471734883f2;hb=9f2bffd2fd0c35e71c5fa55c9a3763a013283be1;hp=39e914afaf59b4dbcac8cf224e1452c0094e4647;hpb=0deb759096939076c1e5075981164823ca4bdc84;p=lamexp%2FLameXP.git

diff --git a/src/Dialog_MainWindow.h b/src/Dialog_MainWindow.h
index 39e914af..9e572640 100644
--- a/src/Dialog_MainWindow.h
+++ b/src/Dialog_MainWindow.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2013 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -21,23 +21,32 @@
 
 #pragma once
 
-#include "../tmp/UIC_MainWindow.h"
+#include <QMainWindow>
 
 //Class declarations
-class QFileSystemModelEx;
-class WorkingBanner;
-class MessageHandlerThread;
+class AbstractEncoder;
 class AudioFileModel;
+class CustomEventFilter;
+class DropBox;
+class FileListModel;
+class MessageHandlerThread;
 class MetaInfoModel;
-class SettingsModel;
+class QActionGroup;
 class QButtonGroup;
-class FileListModel;
-class AbstractEncoder;
+class QFileSystemModelEx;
+class QLabel;
 class QMenu;
-class DropBox;
-class CustomEventFilter;
+class QModelIndex;
+class SettingsModel;
+class WorkingBanner;
 
-class MainWindow: public QMainWindow, private Ui::MainWindow
+//UIC forward declartion
+namespace Ui {
+	class MainWindow;
+}
+
+//MainWindow class
+class MainWindow: public QMainWindow
 {
 	Q_OBJECT
 
@@ -92,6 +101,7 @@ private slots:
 	void gotoFavoriteFolder(void);
 	void gotoHomeFolderButtonClicked(void);
 	void gotoMusicFolderButtonClicked(void);
+	void goUpFolderContextActionTriggered(void);
 	void handleDelayedFiles(void);
 	void hibernateComputerActionTriggered(bool checked);
 	void importCueSheetActionTriggered(bool checked);
@@ -119,6 +129,7 @@ private slots:
 	void outputFolderRowsInserted(const QModelIndex &parent, int start, int end);
 	void outputFolderViewClicked(const QModelIndex &index);
 	void outputFolderViewMoved(const QModelIndex &index);
+	void overwriteModeChanged(int id);
 	void playlistEnabledChanged(void);
 	void prependRelativePathChanged(void);
 	void previewContextActionTriggered(void);
@@ -168,9 +179,12 @@ protected:
 	virtual bool winEvent(MSG *message, long *result);
 
 private:
+	Ui::MainWindow *ui; //for Qt UIC
+
 	void addFiles(const QStringList &files);
 	void addFolder(const QString &path, bool recursive = false, bool delayed = false);
 	bool checkForUpdates(void);
+	void initializeTranslation(void);
 	void refreshFavorites(void);
 	
 	bool m_accepted;
@@ -203,6 +217,7 @@ private:
 	QAction *m_showDetailsContextAction;
 	QAction *m_showFolderContextAction;
 	QAction *m_refreshFolderContextAction;
+	QAction *m_goUpFolderContextAction;
 	QAction *m_addFavoriteFolderAction;
 	QAction *m_exportCsvContextAction;
 	QAction *m_importCsvContextAction;
@@ -211,6 +226,7 @@ private:
 	QActionGroup *m_tabActionGroup;
 	QButtonGroup *m_encoderButtonGroup;
 	QButtonGroup *m_modeButtonGroup;
+	QButtonGroup *m_overwriteButtonGroup;
 
 	CustomEventFilter *m_evenFilterCustumParamsHelp;
 	CustomEventFilter *m_evenFilterOutputFolderMouse;