hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

MainWindow: renamed class to match new style

Browse Source 
Renamed mainWindow to MainWindow and engine::getMainWindow() to
engine::mainWindow(). Additionally reduced some header dependencies.
This commit is contained in:
Tobias Doerffel
2009-08-21 12:04:55 +02:00
parent 14ec1d1d10
commit 7bea6d0e07
54 changed files with 392 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
include/main_window.h → include/MainWindow.h
View File

@@ -1,8 +1,8 @@
/*
* main_window.h - declaration of class mainWindow, the main window of LMMS
* MainWindow.h - declaration of class MainWindow
*
* Copyright (c) 2004-2009 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,7 +22,6 @@
*
*/
#ifndef _MAIN_WINDOW_H
#define _MAIN_WINDOW_H
@@ -56,18 +55,18 @@ enum ProjectPlaybackMode
PPM_PianoRoll
};
class mainWindow : public QMainWindow
class MainWindow : public QMainWindow
{
Q_OBJECT
public:
inline QMdiArea * workspace( void )
inline QMdiArea * workspace()
{
return( m_workspace );
return m_workspace;
}
inline QWidget * toolBar( void )
inline QWidget * toolBar()
{
return( m_toolBar );
return m_toolBar;
}
//int addWidgetToToolBar( QWidget * _w, int _row = -1, int _col = -1 );
@@ -77,24 +76,24 @@ public:
// every function that replaces current file (e.g. creates new file,
// opens another file...) has to call this before and may only process
// if this function returns true
bool mayChangeProject( void );
bool mayChangeProject();
void clearKeyModifiers( void );
void clearKeyModifiers();
inline bool isCtrlPressed( void )
inline bool isCtrlPressed()
{
return( m_keyMods.m_ctrl );
return m_keyMods.m_ctrl;
}
inline bool isShiftPressed( void )
inline bool isShiftPressed()
{
return( m_keyMods.m_shift );
return m_keyMods.m_shift;
}
inline bool isAltPressed( void )
inline bool isAltPressed()
{
return( m_keyMods.m_alt );
return m_keyMods.m_alt;
}
static void saveWidgetState( QWidget * _w, QDomElement & _de );
@@ -102,40 +101,40 @@ public:
inline ProjectPlaybackMode playbackMode() const
{
return m_playbackMode;
return m_playbackMode;
}
void setPlaybackMode( ProjectPlaybackMode _playbackMode );
public slots:
void resetWindowTitle( void );
void resetWindowTitle();
inline void emptySlot( void )
inline void emptySlot()
{
}
inline void enterWhatsThisMode( void )
inline void enterWhatsThisMode()
{
QWhatsThis::enterWhatsThisMode();
}
void createNewProject( void );
void createNewProject();
void createNewProjectFromTemplate( QAction * _idx );
void openProject( void );
bool saveProject( void );
bool saveProjectAs( void );
void showSettingsDialog( void );
void aboutLMMS( void );
void help( void );
void toggleAutomationEditorWin( void );
void toggleBBEditorWin( void );
void toggleSongEditorWin( void );
void toggleProjectNotesWin( void );
void toggleFxMixerWin( void );
void togglePianoRollWin( void );
void toggleControllerRack( void );
void openProject();
bool saveProject();
bool saveProjectAs();
void showSettingsDialog();
void aboutLMMS();
void help();
void toggleAutomationEditorWin();
void toggleBBEditorWin();
void toggleSongEditorWin();
void toggleProjectNotesWin();
void toggleFxMixerWin();
void togglePianoRollWin();
void toggleControllerRack();
void undo( void );
void redo( void );
void undo();
void redo();
void loadResource();
@@ -150,11 +149,11 @@ protected:
private:
mainWindow( void );
mainWindow( const mainWindow & );
virtual ~mainWindow();
MainWindow();
MainWindow( const MainWindow & );
virtual ~MainWindow();
void finalize( void );
void finalize();
void toggleWindow( QWidget * _w );
@@ -171,16 +170,16 @@ private:
QRadioButton * m_radpPianoRoll;
ProjectPlaybackMode m_playbackMode;
lcdSpinBox * m_tempoSpinBox;
meterDialog * m_timeSigDisplay;
automatableSlider * m_masterVolumeSlider;
automatableSlider * m_masterPitchSlider;
textFloat * m_mvsStatus;
textFloat * m_mpsStatus;
QMenu * m_templatesMenu;
QMenu * m_recentlyOpenedProjectsMenu;
int m_custom_templates_count;
@@ -210,36 +209,36 @@ private:
private slots:
void setHighQuality( bool );
void masterVolumeChanged( int _new_val );
void masterVolumePressed( void );
void masterVolumePressed();
void masterVolumeMoved( int _new_val );
void masterVolumeReleased( void );
void masterVolumeReleased();
void masterPitchChanged( int _new_val );
void masterPitchPressed( void );
void masterPitchPressed();
void masterPitchMoved( int _new_val );
void masterPitchReleased( void );
void browseHelp( void );
void fillTemplatesMenu( void );
void masterPitchReleased();
void browseHelp();
void fillTemplatesMenu();
void openRecentlyOpenedProject( QAction * _action );
void showTool( QAction * _idx );
void updateRecentlyOpenedProjectsMenu( void );
void updateRecentlyOpenedProjectsMenu();
void playbackSongClicked( bool );
void playbackBBClicked( bool );
void playbackPianoRollClicked( bool );
void shortcutSpacePressed( void );
void shortcutLPressed( void );
void play( void );
void record( void );
void playAndRecord( void );
void stop( void );
void shortcutSpacePressed();
void shortcutLPressed();
void play();
void record();
void playAndRecord();
void stop();
signals:
void periodicUpdate( void );
void periodicUpdate();
} ;

59
include/engine.h
View File

@@ -2,7 +2,7 @@
* engine.h - engine-system of LMMS
*
* Copyright (c) 2006-2009 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,7 +22,6 @@
*
*/
#ifndef _ENGINE_H
#define _ENGINE_H
@@ -41,7 +40,7 @@ class dummyTrackContainer;
class fxMixer;
class fxMixerView;
class projectJournal;
class mainWindow;
class MainWindow;
class mixer;
class pianoRoll;
class projectNotes;
@@ -58,9 +57,9 @@ class EXPORT engine
{
public:
static void init( const bool _has_gui = true );
static void destroy( void );
static void destroy();
static bool hasGUI( void )
static bool hasGUI()
{
return s_hasGUI;
}
@@ -70,105 +69,105 @@ public:
s_suppressMessages = _on;
}
static bool suppressMessages( void )
static bool suppressMessages()
{
return !s_hasGUI || s_suppressMessages;
}
// core
static mixer * getMixer( void )
static mixer * getMixer()
{
return s_mixer;
}
static fxMixer * getFxMixer( void )
static fxMixer * getFxMixer()
{
return s_fxMixer;
}
static song * getSong( void )
static song * getSong()
{
return s_song;
}
static bbTrackContainer * getBBTrackContainer( void )
static bbTrackContainer * getBBTrackContainer()
{
return s_bbTrackContainer;
}
static projectJournal * getProjectJournal( void )
static projectJournal * getProjectJournal()
{
return s_projectJournal;
}
static UnifiedResourceProvider * resourceProvider( void )
static UnifiedResourceProvider * resourceProvider()
{
return s_resourceProvider;
}
// GUI
static mainWindow * getMainWindow( void )
static MainWindow * mainWindow()
{
return s_mainWindow;
}
static fxMixerView * getFxMixerView( void )
static fxMixerView * getFxMixerView()
{
return s_fxMixerView;
}
static songEditor * getSongEditor( void )
static songEditor * getSongEditor()
{
return s_songEditor;
}
static bbEditor * getBBEditor( void )
static bbEditor * getBBEditor()
{
return s_bbEditor;
}
static pianoRoll * getPianoRoll( void )
static pianoRoll * getPianoRoll()
{
return s_pianoRoll;
}
static projectNotes * getProjectNotes( void )
static projectNotes * getProjectNotes()
{
return s_projectNotes;
}
static automationEditor * getAutomationEditor( void )
static automationEditor * getAutomationEditor()
{
return s_automationEditor;
}
static AutomationRecorder * getAutomationRecorder( void )
static AutomationRecorder * getAutomationRecorder()
{
return s_automationRecorder;
}
static ladspa2LMMS * getLADSPAManager( void )
static ladspa2LMMS * getLADSPAManager()
{
return s_ladspaManager;
}
static dummyTrackContainer * getDummyTrackContainer( void )
static dummyTrackContainer * getDummyTrackContainer()
{
return s_dummyTC;
}
static ControllerRackView * getControllerRackView( void )
static ControllerRackView * getControllerRackView()
{
return s_controllerRackView;
}
static float framesPerTick( void )
static float framesPerTick()
{
return s_framesPerTick;
}
static void updateFramesPerTick( void );
static void updateFramesPerTick();
static const QMap<QString, QString> & pluginFileHandling( void )
static const QMap<QString, QString> & pluginFileHandling()
{
return s_pluginFileHandling;
}
@@ -178,7 +177,7 @@ public:
s_lmmsStyle = _style;
}
static LmmsStyle * getLmmsStyle( void )
static LmmsStyle * getLmmsStyle()
{
return s_lmmsStyle;
}
@@ -187,7 +186,7 @@ public:
static void loadConfiguration( QDomDocument & doc );
static MidiControlListener * getMidiControlListener( void )
static MidiControlListener * getMidiControlListener()
{
return s_midiControlListener;
}
@@ -209,7 +208,7 @@ private:
static MidiControlListener * s_midiControlListener;
// GUI
static mainWindow * s_mainWindow;
static MainWindow * s_mainWindow;
static fxMixerView * s_fxMixerView;
static songEditor * s_songEditor;
static automationEditor * s_automationEditor;
@@ -223,7 +222,7 @@ private:
static QMap<QString, QString> s_pluginFileHandling;
static void initPluginFileHandling( void );
static void initPluginFileHandling();
} ;

2
include/song.h
View File

@@ -312,7 +312,7 @@ private:
friend class engine;
friend class songEditor;
friend class mainWindow;
friend class MainWindow;
friend class ControllerRackView;
signals: