Cleaned-up main window code.

doc/Changelog.html

@@ -31,6 +31,7 @@ a:visited { color: #0000EE; }
 <li>Updated MediaInfo to v0.7.45 Beta (2011-05-02), compiled with ICL 12.0.3 and MSVC 10.0
 <li>Updated language files (big thank-you to all contributors !!!)
 <li>Fixed placement of the Dropbox when the Taskbar is located on the top or on the left side
+<li>Miscellaneous bugfixes
 </ul><br>
 
 <a name="4.01"></a>Changes between v4.00 and v4.01:<br><ul>

src/Config.h

@@ -29,8 +29,8 @@
 #define VER_LAMEXP_MINOR_HI					0
 #define VER_LAMEXP_MINOR_LO					2
 #define VER_LAMEXP_TYPE						Beta
-#define VER_LAMEXP_PATCH					2
+#define VER_LAMEXP_PATCH					3
-#define VER_LAMEXP_BUILD					539
+#define VER_LAMEXP_BUILD					540
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tools versions

src/Dialog_MainWindow.h

@@ -47,121 +47,125 @@ public:
 	bool isAccepted() { return m_accepted; }
 
 private slots:
-	void windowShown(void);
 	void aboutButtonClicked(void);
-	void encodeButtonClicked(void);
-	void closeButtonClicked(void);
-	void addFilesButtonClicked(void);
-	void clearFilesButtonClicked(void);
-	void removeFileButtonClicked(void);
-	void fileDownButtonClicked(void);
-	void fileUpButtonClicked(void);
-	void showDetailsButtonClicked(void);
-	void tabPageChanged(int idx);
-	void tabActionActivated(QAction *action);
-	void styleActionActivated(QAction *action);
-	void languageActionActivated(QAction *action);
-	void languageFromFileActionActivated(bool checked);
-	void outputFolderViewClicked(const QModelIndex &index);
-	void outputFolderViewMoved(const QModelIndex &index);
-	void makeFolderButtonClicked(void);
-	void gotoHomeFolderButtonClicked(void);
-	void gotoDesktopButtonClicked(void);
-	void gotoMusicFolderButtonClicked(void);
-	void checkUpdatesActionActivated(void);
-	void visitHomepageActionActivated(void);
-	void documentActionActivated(void);
-	void openFolderActionActivated(void);
-	void notifyOtherInstance(void);
 	void addFileDelayed(const QString &filePath);
-	void handleDelayedFiles(void);
+	void addFilesButtonClicked(void);
-	void editMetaButtonClicked(void);
-	void clearMetaButtonClicked(void);
-	void updateEncoder(int id);
-	void updateRCMode(int id);
-	void updateBitrate(int value);
-	void updateLameAlgoQuality(int value);
-	void bitrateManagementEnabledChanged(bool checked);
-	void bitrateManagementMinChanged(int value);
-	void bitrateManagementMaxChanged(int value);
-	void samplingRateChanged(int value);
-	void channelModeChanged(int value);
-	void neroAACProfileChanged(int value);
-	void neroAAC2PassChanged(bool checked);
 	void aftenCodingModeChanged(int value);
 	void aftenDRCModeChanged(int value);
-	void aftenSearchSizeChanged(int value);
 	void aftenFastAllocationChanged(bool checked);
+	void aftenSearchSizeChanged(int value);
+	void autoDetectInstancesChanged(bool checked);
+	void bitrateManagementEnabledChanged(bool checked);
+	void bitrateManagementMaxChanged(int value);
+	void bitrateManagementMinChanged(int value);
+	void browseCustomTempFolderButtonClicked(void);
+	void channelModeChanged(int value);
+	void checkForBetaUpdatesActionTriggered(bool checked);
+	void checkUpdatesActionActivated(void);
+	void clearFilesButtonClicked(void);
+	void clearMetaButtonClicked(void);
+	void closeButtonClicked(void);
+	void customParamsChanged(void);
+	void customTempFolderChanged(const QString &text);
+	void disableNeroAacNotificationsActionTriggered(bool checked);
+	void disableShellIntegrationActionTriggered(bool);
+	void disableSoundsActionTriggered(bool checked);
+	void disableUpdateReminderActionTriggered(bool checked);
+	void disableWmaDecoderNotificationsActionTriggered(bool checked);
+	void documentActionActivated(void);
+	void editMetaButtonClicked(void);
+	void encodeButtonClicked(void);
+	void fileDownButtonClicked(void);
+	void fileUpButtonClicked(void);
+	void findFileContextActionTriggered(void);
+	void gotoDesktopButtonClicked(void);
+	void gotoHomeFolderButtonClicked(void);
+	void gotoMusicFolderButtonClicked(void);
+	void handleDelayedFiles(void);
+	void importCueSheetActionTriggered(bool checked);
+	void installWMADecoderActionTriggered(bool checked);
+	void languageActionActivated(QAction *action);
+	void languageFromFileActionActivated(bool checked);
+	void makeFolderButtonClicked(void);
+	void metaTagsEnabledChanged(void);
+	void neroAAC2PassChanged(bool checked);
+	void neroAACProfileChanged(int value);
 	void normalizationEnabledChanged(bool checked);
 	void normalizationMaxVolumeChanged(double volume);
+	void notifyOtherInstance(void);
+	void openFolderActionActivated(void);
+	void outputFolderContextMenu(const QPoint &pos);
+	void outputFolderViewClicked(const QModelIndex &index);
+	void outputFolderViewMoved(const QModelIndex &index);
+	void playlistEnabledChanged(void);
+	void prependRelativePathChanged(void);
+	void previewContextActionTriggered(void);
+	void removeFileButtonClicked(void);
+	void resetAdvancedOptionsButtonClicked(void);
+	void restoreCursor(void);
+	void samplingRateChanged(int value);
+	void saveToSourceFolderChanged(void);
+	void showDetailsButtonClicked(void);
+	void showDropBoxWidgetActionTriggered(bool checked);
+	void showFolderContextActionTriggered(void);
+	void sourceFilesContextMenu(const QPoint &pos);
+	void sourceModelChanged(void);
+	void styleActionActivated(QAction *action);
+	void tabActionActivated(QAction *action);
+	void tabPageChanged(int idx);
 	void toneAdjustBassChanged(double value);
 	void toneAdjustTrebleChanged(double value);
 	void toneAdjustTrebleReset(void);
-	void customParamsChanged(void);
+	void updateBitrate(int value);
+	void updateEncoder(int id);
+	void updateLameAlgoQuality(int value);
 	void updateMaximumInstances(int value);
-	void autoDetectInstancesChanged(bool checked);
+	void updateRCMode(int id);
-	void browseCustomTempFolderButtonClicked(void);
-	void customTempFolderChanged(const QString &text);
 	void useCustomTempFolderChanged(bool checked);
-	void resetAdvancedOptionsButtonClicked(void);
+	void visitHomepageActionActivated(void);
-	void sourceModelChanged(void);
+	void windowShown(void);
-	void metaTagsEnabledChanged(void);
-	void playlistEnabledChanged(void);
-	void saveToSourceFolderChanged(void);
-	void prependRelativePathChanged(void);
-	void restoreCursor(void);
-	void sourceFilesContextMenu(const QPoint &pos);
-	void previewContextActionTriggered(void);
-	void findFileContextActionTriggered(void);
-	void disableUpdateReminderActionTriggered(bool checked);
-	void disableSoundsActionTriggered(bool checked);
-	void outputFolderContextMenu(const QPoint &pos);
-	void showFolderContextActionTriggered(void);
-	void installWMADecoderActionTriggered(bool checked);
-	void importCueSheetActionTriggered(bool checked);
-	void disableNeroAacNotificationsActionTriggered(bool checked);
-	void disableWmaDecoderNotificationsActionTriggered(bool checked);
-	void showDropBoxWidgetActionTriggered(bool checked);
-	void checkForBetaUpdatesActionTriggered(bool checked);
-	void disableShellIntegrationActionTriggered(bool);
 
 protected:
-	void showEvent(QShowEvent *event);
+	void changeEvent(QEvent *e);
+	void closeEvent(QCloseEvent *event);
 	void dragEnterEvent(QDragEnterEvent *event);
 	void dropEvent(QDropEvent *event);
-	void closeEvent(QCloseEvent *event);
-	void resizeEvent(QResizeEvent *event);
 	bool eventFilter(QObject *obj, QEvent *event);
-	void changeEvent(QEvent *e);
+	void resizeEvent(QResizeEvent *event);
+	void showEvent(QShowEvent *event);
 
 private:
 	void addFiles(const QStringList &files);
 	void addFolder(const QString &path, bool recursive = false);
-	bool installWMADecoder(void);
 	bool checkForUpdates(void);
-
+	bool installWMADecoder(void);
+	
 	bool m_accepted;
 	bool m_firstTimeShown;
-	FileListModel *m_fileListModel;
+
-	QFileSystemModelEx *m_fileSystemModel;
+	const bool m_neroEncoderAvailable;
-	QActionGroup *m_tabActionGroup;
+
-	QActionGroup *m_styleActionGroup;
-	QActionGroup *m_languageActionGroup;
-	QButtonGroup *m_encoderButtonGroup;
-	QButtonGroup *m_modeButtonGroup;
-	QAction *m_showDetailsContextAction;
-	QAction *m_previewContextAction;
-	QAction *m_findFileContextAction;
-	QAction *m_showFolderContextAction;
 	WorkingBanner *m_banner;
-	MessageHandlerThread *m_messageHandler;
 	QStringList *m_delayedFileList;
 	QTimer *m_delayedFileTimer;
+	DropBox *m_dropBox;
+	QLabel *m_dropNoteLabel;
+	FileListModel *m_fileListModel;
+	QFileSystemModelEx *m_fileSystemModel;
+	MessageHandlerThread *m_messageHandler;
 	AudioFileModel *m_metaData;
 	MetaInfoModel *m_metaInfoModel;
-	SettingsModel *m_settings;
-	QLabel *m_dropNoteLabel;
-	QMenu *m_sourceFilesContextMenu;
 	QMenu *m_outputFolderContextMenu;
-	DropBox *m_dropBox;
+	SettingsModel *m_settings;
+	QMenu *m_sourceFilesContextMenu;
+
+	QAction *m_findFileContextAction;
+	QAction *m_previewContextAction;
+	QAction *m_showDetailsContextAction;
+	QAction *m_showFolderContextAction;
+	QActionGroup *m_languageActionGroup;
+	QActionGroup *m_styleActionGroup;
+	QActionGroup *m_tabActionGroup;
+	QButtonGroup *m_encoderButtonGroup;
+	QButtonGroup *m_modeButtonGroup;
 };