Permalink
Browse files

Switched the method of how the Designer UI file is used in the MainWi…

…ndow class to "The Single Inheritance Approach" (with "Using a Pointer Member Variable"). This is the method which Qt recommends for large projects.
  • Loading branch information...
1 parent 1d960d5 commit 7077650bb67756ed9d463e138ea017d44f5ab1e7 @lordmulder committed Dec 4, 2012
Showing with 619 additions and 613 deletions.
  1. +2 −1 LameXP.rc
  2. +1 −1 src/Config.h
  3. +582 −576 src/Dialog_MainWindow.cpp
  4. +21 −10 src/Dialog_MainWindow.h
  5. +0 −10 src/Dialog_Processing.cpp
  6. +1 −0 src/Global.cpp
  7. +0 −2 src/Resource.h
  8. +1 −1 src/Thread_Initialization.cpp
  9. +11 −12 src/WinMain.cpp
View
@@ -1,6 +1,7 @@
// Microsoft Visual C++ generated resource script.
//
-#include "src\Resource.h"
+#include "src/Resource.h"
+#include "src/Config.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
View
@@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 7
#define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 5
-#define VER_LAMEXP_BUILD 1201
+#define VER_LAMEXP_BUILD 1204
///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -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
@@ -169,6 +178,8 @@ private slots:
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);
View
@@ -282,8 +282,6 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, AudioFileModel
ProcessingDialog::~ProcessingDialog(void)
{
- fprintf(stderr, "BUMP 1\n"); fflush(stderr);
-
view_log->setModel(NULL);
if(m_progressIndicator)
@@ -319,8 +317,6 @@ ProcessingDialog::~ProcessingDialog(void)
}
}
- fprintf(stderr, "BUMP 2\n"); fflush(stderr);
-
while(!m_threadList.isEmpty())
{
ProcessThread *thread = m_threadList.takeFirst();
@@ -329,8 +325,6 @@ ProcessingDialog::~ProcessingDialog(void)
delete thread;
}
- fprintf(stderr, "BUMP 3\n"); fflush(stderr);
-
LAMEXP_DELETE(m_progressIndicator);
LAMEXP_DELETE(m_systemTray);
LAMEXP_DELETE(m_diskObserver);
@@ -342,12 +336,8 @@ ProcessingDialog::~ProcessingDialog(void)
LAMEXP_DELETE(m_contextMenu);
LAMEXP_DELETE(m_progressModel);
- fprintf(stderr, "BUMP 4\n"); fflush(stderr);
-
WinSevenTaskbar::setOverlayIcon(this, NULL);
WinSevenTaskbar::setTaskbarState(this, WinSevenTaskbar::WinSevenTaskbarNoState);
-
- fprintf(stderr, "BUMP 5\n"); fflush(stderr);
}
////////////////////////////////////////////////////////////
View
@@ -51,6 +51,7 @@
//LameXP includes
#include "Resource.h"
+#include "Config.h"
#include "LockedFile.h"
//CRT includes
View
@@ -19,8 +19,6 @@
// http://www.gnu.org/licenses/gpl-2.0.txt
///////////////////////////////////////////////////////////////////////////////
-#include "Config.h"
-
/*
* Resource ID's
*/
@@ -747,7 +747,7 @@ void InitializationThread::selfTest(void)
qDebug("%02i -> %s", ++n, g_lamexp_tools[i].pcName);
}
}
- if(n != 28)
+ if(n != 27)
{
qFatal("Tool count mismatch !!!");
}
View
@@ -2,15 +2,15 @@
// qtmain_win.cpp
// ==========================================================================
//
-// This source file is included from Qt v4.8.3, because VS2012 won't link
-// with the 'qtmain.lib' from the official Qt v4.8.3 (VS2010) release.
+// This source file is included from Qt v4.8.4, because VS2012 won't link
+// with the 'qtmain.lib' from the official Qt v4.8.4 (VS2010) release.
//
// ==========================================================================
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the Windows main function of the Qt Toolkit.
**
@@ -26,10 +26,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
+** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+** of its contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -48,10 +48,9 @@
****************************************************************************/
#include "qt_windows.h"
-
-#include <QByteArray>
-#include <QString>
-#include <QVector>
+#include "qbytearray.h"
+#include "qstring.h"
+#include "qvector.h"
/*
This file contains the code in the qtmain library for Windows.

0 comments on commit 7077650

Please sign in to comment.