mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-07 04:10:08 +00:00
Code Activity

Introjucer: added company name property to project, and better exe property info generation in MSVC resource files. Added method OpenGLComponent::rebuildContext().

Browse source
This commit is contained in:
jules 2012-02-22 11:11:34 +00:00
parent 092a0166cc
commit 51b2068576
61 changed files with 1347 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

40
extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp
View file

@ -300,13 +300,19 @@ bool ProjectContentComponent::perform (const InvocationInfo& info)
{
case CommandIDs::saveProject:
if (project != nullptr)
project->save (true, true);
{
if (! reinvokeCommandAfterClosingPropertyEditors (info))
project->save (true, true);
}
break;
case CommandIDs::saveProjectAs:
if (project != nullptr)
project->saveAsInteractive (true);
{
if (! reinvokeCommandAfterClosingPropertyEditors (info))
project->saveAsInteractive (true);
}
break;
@ -315,7 +321,10 @@ bool ProjectContentComponent::perform (const InvocationInfo& info)
MainWindow* mw = Component::findParentComponentOfClass ((MainWindow*) 0);
if (mw != nullptr)
mw->closeCurrentProject();
{
if (! reinvokeCommandAfterClosingPropertyEditors (info))
mw->closeCurrentProject();
}
}
break;
@ -331,12 +340,18 @@ bool ProjectContentComponent::perform (const InvocationInfo& info)
break;
case CommandIDs::saveAndOpenInIDE:
if (project != nullptr && project->save (true, true) == FileBasedDocument::savedOk)
if (project != nullptr)
{
ScopedPointer <ProjectExporter> exporter (ProjectExporter::createPlatformDefaultExporter (*project));
if (! reinvokeCommandAfterClosingPropertyEditors (info))
{
if (project->save (true, true) == FileBasedDocument::savedOk)
{
ScopedPointer <ProjectExporter> exporter (ProjectExporter::createPlatformDefaultExporter (*project));
if (exporter != nullptr)
exporter->launchProject();
if (exporter != nullptr)
exporter->launchProject();
}
}
}
break;
@ -362,3 +377,14 @@ bool ProjectContentComponent::perform (const InvocationInfo& info)
return true;
}
bool ProjectContentComponent::reinvokeCommandAfterClosingPropertyEditors (const InvocationInfo& info)
{
if (reinvokeCommandAfterCancellingModalComps (info))
{
grabKeyboardFocus(); // to force any open labels to close their text editors
return true;
}
return false;
}