mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-15 00:24:19 +00:00
Code Activity

Minor introjucer work.

Browse source
This commit is contained in:
jules 2012-06-15 11:02:21 +01:00
parent b4446d34ca
commit a016944e69
4 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
extras/Introjucer/Source/Application/jucer_Application.h
View file

@ -159,8 +159,6 @@ public:
}
virtual void doExtraInitialisation() {}
virtual void projectOpened (Project*) {}
virtual void projectClosed (Project*) {}
static JucerApplication* getApp()
{
@ -487,7 +485,7 @@ public:
ScopedPointer<MainMenuModel> menuModel;
virtual MainWindow* createNewMainWindow()
MainWindow* createNewMainWindow()
{
MainWindow* mw = new MainWindow();
mainWindows.add (mw);
@ -496,6 +494,11 @@ public:
return mw;
}
virtual Component* createProjectContentComponent() const
{
return new ProjectContentComponent();
}
private:
OwnedArray <MainWindow> mainWindows;

2
extras/Introjucer/Source/Application/jucer_MainWindow.cpp
View file

@ -94,7 +94,7 @@ void MainWindow::createProjectContentCompIfNeeded()
if (getProjectContentComponent() == nullptr)
{
clearContentComponent();
setContentOwned (new ProjectContentComponent(), false);
setContentOwned (JucerApplication::getApp()->createProjectContentComponent(), false);
}
}

6
extras/Introjucer/Source/Project/jucer_Project.cpp
View file

@ -63,14 +63,10 @@ Project::Project (const File& file_)
mainProjectIcon.setImage (ImageCache::getFromMemory (BinaryData::juce_icon_png, BinaryData::juce_icon_pngSize));
projectRoot.addListener (this);
JucerApplication::getApp()->projectOpened (this);
}
Project::~Project()
{
JucerApplication::getApp()->projectClosed (this);
projectRoot.removeListener (this);
OpenDocumentManager::getInstance()->closeAllDocumentsUsingProject (*this, false);
}
@ -233,9 +229,7 @@ Result Project::loadDocument (const File& file)
return Result::fail ("The document contains errors and couldn't be parsed!");
registerRecentFile (file);
JucerApplication::getApp()->projectClosed (this);
projectRoot = newTree;
JucerApplication::getApp()->projectOpened (this);
removeDefunctExporters();
setMissingDefaultValues();

3
extras/Introjucer/Source/Project/jucer_ProjectContentComponent.h
View file

@ -44,7 +44,8 @@ public:
void paint (Graphics& g);
void setProject (Project* project);
Project* getProject() const noexcept { return project; }
virtual void setProject (Project* project);
void saveTreeViewState();
bool showEditorForFile (const File& f);