Moved UI files from src/gui/dialogs to src/gui/Forms and renamed files
All UI files are now located in src/gui/Forms and have been renamed. Old classes using some of the forms (AboutDialog, ExportProjectDialog) have been adapted to instantiate Ui::* instead of inheriting from it.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
/*
|
||||
* about_dialog.h - declaration of class aboutDialog
|
||||
* AboutDialog.h - declaration of class AboutDialog
|
||||
*
|
||||
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
@@ -22,22 +22,22 @@
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _ABOUT_DIALOG_H
|
||||
#define _ABOUT_DIALOG_H
|
||||
|
||||
#include <QtGui/QDialog>
|
||||
|
||||
#include "ui_about_dialog.h"
|
||||
namespace Ui { class AboutDialog; }
|
||||
|
||||
|
||||
class aboutDialog : public QDialog, public Ui::AboutDialog
|
||||
class AboutDialog : public QDialog
|
||||
{
|
||||
public:
|
||||
aboutDialog( void );
|
||||
AboutDialog();
|
||||
|
||||
private:
|
||||
Ui::AboutDialog * ui;
|
||||
|
||||
} ;
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
/*
|
||||
* export_project_dialog.h - declaration of class exportProjectDialog which is
|
||||
* responsible for exporting project
|
||||
* ExportProjectDialog.h - declaration of class ExportProjectDialog which
|
||||
* offers options for exporting project
|
||||
*
|
||||
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
@@ -23,36 +23,34 @@
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _EXPORT_PROJECT_DIALOG_H
|
||||
#define _EXPORT_PROJECT_DIALOG_H
|
||||
|
||||
#include <QtGui/QDialog>
|
||||
|
||||
#include "ui_export_project.h"
|
||||
|
||||
namespace Ui { class ExportProjectDialog; }
|
||||
class ProjectRenderer;
|
||||
|
||||
|
||||
class exportProjectDialog : public QDialog, public Ui::ExportProjectDialog
|
||||
class ExportProjectDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
exportProjectDialog( const QString & _file_name, QWidget * _parent );
|
||||
virtual ~exportProjectDialog();
|
||||
ExportProjectDialog( const QString & _file_name, QWidget * _parent );
|
||||
virtual ~ExportProjectDialog();
|
||||
|
||||
|
||||
protected:
|
||||
virtual void reject( void );
|
||||
virtual void reject();
|
||||
virtual void closeEvent( QCloseEvent * _ce );
|
||||
|
||||
|
||||
private slots:
|
||||
void startBtnClicked( void );
|
||||
void startBtnClicked();
|
||||
void updateTitleBar( int );
|
||||
|
||||
|
||||
private:
|
||||
Ui::ExportProjectDialog * ui;
|
||||
QString m_fileName;
|
||||
ProjectRenderer * m_renderer;
|
||||
|
||||
Reference in New Issue
Block a user