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

Introjucer: commands to move back/forwards through open docs.

Browse source
This commit is contained in:
jules 2012-07-07 21:11:06 +01:00
parent 39c974194e
commit 0475cedff5
11 changed files with 325 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,6 +102,7 @@ ProjectContentComponent::~ProjectContentComponent()
{
setProject (nullptr);
contentView = nullptr;
removeChildComponent (&bubbleMessage);
jassert (getNumChildComponents() <= 1);
}
@ -236,16 +237,25 @@ bool ProjectContentComponent::showEditorForFile (const File& f)
|| showDocument (JucerApplication::getApp()->openDocumentManager.openFile (project, f));
}
File ProjectContentComponent::getCurrentFile() const
{
return currentDocument != nullptr ? currentDocument->getFile()
: File::nonexistent;
}
bool ProjectContentComponent::showDocument (OpenDocumentManager::Document* doc)
{
if (doc == nullptr)
return false;
JucerApplication::getApp()->openDocumentManager.moveDocumentToTopOfStack (doc);
if (doc->hasFileBeenModifiedExternally())
doc->reloadFromFile();
if (doc == getCurrentDocument())
return true;
recentDocumentList.newDocumentOpened (doc);
return setEditorComponent (doc->createEditor(), doc);
}
@ -255,18 +265,27 @@ void ProjectContentComponent::hideEditor()
contentView = nullptr;
updateMainWindowTitle();
commandManager->commandStatusChanged();
recentDocumentList.clear();
}
void ProjectContentComponent::hideDocument (OpenDocumentManager::Document* doc)
{
if (doc == currentDocument)
hideEditor();
{
OpenDocumentManager::Document* replacement = recentDocumentList.getClosestPreviousDocOtherThan (doc);
if (replacement != nullptr)
showDocument (replacement);
else
hideEditor();
}
}
bool ProjectContentComponent::setEditorComponent (Component* editor, OpenDocumentManager::Document* doc)
{
if (editor != nullptr)
{
contentView = nullptr;
contentView = editor;
currentDocument = doc;
addAndMakeVisible (editor);
@ -274,6 +293,7 @@ bool ProjectContentComponent::setEditorComponent (Component* editor, OpenDocumen
updateMainWindowTitle();
commandManager->commandStatusChanged();
editor->grabKeyboardFocus();
return true;
}
@ -281,6 +301,16 @@ bool ProjectContentComponent::setEditorComponent (Component* editor, OpenDocumen
return false;
}
bool ProjectContentComponent::goToPreviousFile()
{
return showDocument (recentDocumentList.getPrevious());
}
bool ProjectContentComponent::goToNextFile()
{
return showDocument (recentDocumentList.getNext());
}
void ProjectContentComponent::updateMainWindowTitle()
{
MainWindow* mw = findParentComponentOfClass<MainWindow>();
@ -314,6 +344,8 @@ void ProjectContentComponent::getAllCommands (Array <CommandID>& commands)
CommandIDs::openInIDE,
CommandIDs::saveAndOpenInIDE,
CommandIDs::showProjectSettings,
CommandIDs::goToPreviousDoc,
CommandIDs::goToNextDoc,
StandardApplicationCommandIDs::del };
commands.addArray (ids, numElementsInArray (ids));
@ -361,6 +393,26 @@ void ProjectContentComponent::getCommandInfo (const CommandID commandID, Applica
#endif
break;
case CommandIDs::goToPreviousDoc:
result.setInfo ("Previous Document", "Go to previous document", CommandCategories::general, 0);
result.setActive (recentDocumentList.canGoToPrevious());
#if JUCE_MAC
result.defaultKeypresses.add (KeyPress (KeyPress::leftKey, ModifierKeys::commandModifier | ModifierKeys::ctrlModifier, 0));
#else
result.defaultKeypresses.add (KeyPress (KeyPress::leftKey, ModifierKeys::ctrlModifier | ModifierKeys::shiftModifier, 0));
#endif
break;
case CommandIDs::goToNextDoc:
result.setInfo ("Next Document", "Go to next document", CommandCategories::general, 0);
result.setActive (recentDocumentList.canGoToNext());
#if JUCE_MAC
result.defaultKeypresses.add (KeyPress (KeyPress::rightKey, ModifierKeys::commandModifier | ModifierKeys::ctrlModifier, 0));
#else
result.defaultKeypresses.add (KeyPress (KeyPress::rightKey, ModifierKeys::ctrlModifier | ModifierKeys::shiftModifier, 0));
#endif
break;
case CommandIDs::openInIDE:
#if JUCE_MAC
result.setInfo ("Open in XCode...",
@ -449,6 +501,14 @@ bool ProjectContentComponent::perform (const InvocationInfo& info)
JucerApplication::getApp()->openDocumentManager.closeDocument (currentDocument, true);
break;
case CommandIDs::goToPreviousDoc:
goToPreviousFile();
break;
case CommandIDs::goToNextDoc:
goToNextFile();
break;
case CommandIDs::openInIDE:
if (project != nullptr)
{

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

@ -35,7 +35,7 @@ class ProjectTreeViewBase;
*/
class ProjectContentComponent : public Component,
public ApplicationCommandTarget,
public ChangeListener
private ChangeListener
{
public:
//==============================================================================
@ -47,21 +47,24 @@ public:
void saveTreeViewState();
bool showEditorForFile (const File& f);
File getCurrentFile() const;
bool showDocument (OpenDocumentManager::Document* doc);
void hideDocument (OpenDocumentManager::Document* doc);
OpenDocumentManager::Document* getCurrentDocument() const { return currentDocument; }
void hideEditor();
bool setEditorComponent (Component* editor, OpenDocumentManager::Document* doc);
Component* getEditorComponent() const { return contentView; }
OpenDocumentManager::Document* getCurrentDocument() const { return currentDocument; }
File getCurrentFile() const { return currentDocument != nullptr ? currentDocument->getFile() : File::nonexistent; }
bool goToPreviousFile();
bool goToNextFile();
void updateMissingFileStatuses();
virtual void createProjectTabs();
void showBubbleMessage (const Rectangle<int>& pos, const String& text);
void changeListenerCallback (ChangeBroadcaster*);
//==============================================================================
ApplicationCommandTarget* getNextCommandTarget();
void getAllCommands (Array <CommandID>& commands);
@ -76,15 +79,16 @@ public:
protected:
Project* project;
OpenDocumentManager::Document* currentDocument;
RecentDocumentList recentDocumentList;
TabbedComponent treeViewTabs;
ScopedPointer<ResizableEdgeComponent> resizerBar;
ScopedPointer<Component> contentView;
ComponentBoundsConstrainer treeSizeConstrainer;
BubbleMessageComponent bubbleMessage;
void changeListenerCallback (ChangeBroadcaster*);
void updateMainWindowTitle();
bool reinvokeCommandAfterClosingPropertyEditors (const InvocationInfo&);
bool canProjectBeLaunched() const;