IDE now displays saved/unsaved status of files, will prompt to save all on run, UIButton will now dispatch click event on Enter press, IDE text editor sets saved/unsaved flag

IDE/Contents/Include/PolycodeEditor.h

@@ -56,11 +56,15 @@ public:
 	
 	String getEditorType() { return editorType; }
 	
+	bool hasChanges() { return _hasChanges;}
+	
+	void setHasChanges(bool newVal);
+	
 	PolycodeProject *parentProject;
 		
 protected:
 
-	
+	bool _hasChanges;
 
 	String filePath;
 	bool _isReadOnly;

IDE/Contents/Include/PolycodeEditorManager.h

@@ -36,9 +36,16 @@ class PolycodeEditorManager : public EventDispatcher {
 		PolycodeEditor *createEditorForExtension(String extension);
 		void registerEditorFactory(PolycodeEditorFactory *editorFactory);
 	
+		void handleEvent(Event *event);
+	
 		void setCurrentEditor(PolycodeEditor *editor, bool sendChangeEvent = true);
 		PolycodeEditor *getCurrentEditor() { return currentEditor; }
 		
+		void saveAll();
+		
+		bool hasUnsavedFiles();
+		bool hasUnsavedFilesForProject(PolycodeProject *project);
+		
 	//	int close
 	std::vector<PolycodeEditor*> openEditors;
 		

IDE/Contents/Include/PolycodeIDEApp.h

@@ -79,12 +79,13 @@ public:
 	
 	void addFiles();
 	
-	void newGroup();
+	void newGroup();	
 	void openProject();
 	void closeProject();	
 	void saveFile();
 	void findText();
 	void runProject();
+	void doRunProject();
 	void exportProject();	
 	
 	// system callbacks
@@ -101,6 +102,8 @@ public:
 	Core *core;	
 protected:
 
+	bool runNextFrame;
+
 	bool willRunProject;
 	PolycodeFrame *frame;
 	

IDE/Contents/Include/PolycodeTextEditor.h

@@ -95,7 +95,7 @@ public:
 protected:
 
 	FindBar *findBar;
-	
+	bool isLoading;
 	String lastFindString;
 
 	PolycodeSyntaxHighlighter *syntaxHighligher;

IDE/Contents/Include/ToolWindows.h

@@ -58,8 +58,6 @@ class YesNoPopup : public UIWindow {
 		void handleEvent(Event *event);
 		
 		String action;
-		
-	protected:
 	
 		ScreenLabel *captionLabel;
 	

IDE/Contents/Source/PolycodeEditor.cpp

@@ -48,6 +48,7 @@ PolycodeEditor::PolycodeEditor(bool _isReadOnly) : ScreenEntity(), ClipboardProv
 	this->_isReadOnly = _isReadOnly;
 	enableScissor = true;	
 	processInputEvents = true;
+	_hasChanges = false;
 
 	Core *core = CoreServices::getInstance()->getCore();
 	
@@ -55,6 +56,13 @@ PolycodeEditor::PolycodeEditor(bool _isReadOnly) : ScreenEntity(), ClipboardProv
 	core->addEventListener(this, Core::EVENT_PASTE);
 }
 
+void PolycodeEditor::setHasChanges(bool newVal) {
+	if(_hasChanges != newVal) {
+		_hasChanges = newVal;	
+		dispatchEvent(new Event(), Event::CHANGE_EVENT);
+	}
+}
+
 void PolycodeEditor::handleEvent(Event *event) {
 	if(event->getDispatcher() == CoreServices::getInstance()->getCore()) {
 		switch(event->getEventCode()) {

IDE/Contents/Source/PolycodeEditorManager.cpp

@@ -37,12 +37,42 @@ PolycodeEditor *PolycodeEditorManager::createEditorForExtension(String extension
 		if(factory->canHandleExtension(extension)) {
 			PolycodeEditor *editor = factory->createEditor();
 			openEditors.push_back(editor);
+			editor->addEventListener(this, Event::CHANGE_EVENT);
 			return editor;
 		}
 	}
 	return NULL;
 }
 
+bool PolycodeEditorManager::hasUnsavedFiles() {
+	for(int i=0; i < openEditors.size();i++) {
+		PolycodeEditor *editor = openEditors[i];
+		if(editor->hasChanges())
+			return true;
+	}
+	return false;
+}
+
+void PolycodeEditorManager::saveAll() {
+	for(int i=0; i < openEditors.size();i++) {
+		PolycodeEditor *editor = openEditors[i];
+		editor->saveFile();
+	}
+}
+
+bool PolycodeEditorManager::hasUnsavedFilesForProject(PolycodeProject *project) {
+	for(int i=0; i < openEditors.size();i++) {
+		PolycodeEditor *editor = openEditors[i];
+		if(editor->hasChanges() && editor->parentProject == project)
+			return true;
+	}
+	return false;
+}
+
+void PolycodeEditorManager::handleEvent(Event *event) {
+	dispatchEvent(new Event(), Event::CHANGE_EVENT);
+}
+
 void PolycodeEditorManager::setCurrentEditor(PolycodeEditor *editor, bool sendChangeEvent) {
 	currentEditor = editor;
 	if(sendChangeEvent){

IDE/Contents/Source/PolycodeFrame.cpp

@@ -685,6 +685,10 @@ void PolycodeFrame::showModal(UIWindow *modalChild) {
 	modalChild->showWindow();
 	modalChild->addEventListener(this, UIEvent::CLOSE_EVENT);
 	Resize(frameSizeX, frameSizeY);
+	
+	if(modalChild == yesNoPopup) {
+		yesNoPopup->focusChild(yesNoPopup->okButton);
+	}
 }
 
 PolycodeProjectBrowser *PolycodeFrame::getProjectBrowser() {
@@ -749,7 +753,13 @@ void PolycodeFrame::handleEvent(Event *event) {
 		
 		for(int i=0; i < editorManager->openEditors.size(); i++) {
 			OSFileEntry entry(editorManager->openEditors[i]->getFilePath(), OSFileEntry::TYPE_FILE);
-			currentFileSelector->addComboItem(entry.name);
+			
+			if(editorManager->openEditors[i]->hasChanges()) {
+				currentFileSelector->addComboItem("* " +entry.name);			
+			} else {
+				currentFileSelector->addComboItem(entry.name);
+			}
+			
 			if(editorManager->getCurrentEditor() == editorManager->openEditors[i]) {
 				currentFileSelector->setSelectedIndex(i);
 			}

IDE/Contents/Source/PolycodeIDEApp.cpp

@@ -34,6 +34,8 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 	core = new POLYCODE_CORE(view, 900,700,false,true, 0, 0,30, -1);	
 //	core->pauseOnLoseFocus = true;
 	
+	runNextFrame = false;
+	
 	core->addEventListener(this, Core::EVENT_CORE_RESIZE);
 	core->addEventListener(this, Core::EVENT_LOST_FOCUS);
 	core->addEventListener(this, Core::EVENT_GAINED_FOCUS);
@@ -86,6 +88,7 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 
 	frame->textInputPopup->addEventListener(this, UIEvent::OK_EVENT);	
 	frame->yesNoPopup->addEventListener(this, UIEvent::OK_EVENT);
+	frame->yesNoPopup->addEventListener(this, UIEvent::CANCEL_EVENT);
 	
 	frame->newProjectWindow->addEventListener(this, UIEvent::OK_EVENT);
 	frame->exportProjectWindow->addEventListener(this, UIEvent::OK_EVENT);
@@ -285,16 +288,26 @@ void PolycodeIDEApp::exportProject() {
 	}	
 }
 
-void PolycodeIDEApp::runProject() {
+void PolycodeIDEApp::doRunProject() {
 	printf("Running project...\n");
 	stopProject();
 
+	String outPath = PolycodeToolLauncher::generateTempPath(projectManager->getActiveProject()) + ".polyapp";
+	PolycodeToolLauncher::buildProject(projectManager->getActiveProject(), outPath);
+	PolycodeToolLauncher::runPolyapp(outPath);
+}
+
+void PolycodeIDEApp::runProject() {
 	if(projectManager->getActiveProject()) {
-		String outPath = PolycodeToolLauncher::generateTempPath(projectManager->getActiveProject()) + ".polyapp";
-		PolycodeToolLauncher::buildProject(projectManager->getActiveProject(), outPath);
-		PolycodeToolLauncher::runPolyapp(outPath);
+		if(editorManager->hasUnsavedFilesForProject(projectManager->getActiveProject())) {
+			frame->yesNoPopup->setCaption("This project has unsaved files. Save before building?");
+			frame->yesNoPopup->action = "saveAndRun";
+			frame->showModal(frame->yesNoPopup);		
+		} else {
+			doRunProject();	
+		}
 	} else {
-		PolycodeConsole::print("No active project!\n");
+		PolycodeConsole::print("No active project!\n");	
 	}
 }
 
@@ -544,10 +557,26 @@ void PolycodeIDEApp::handleEvent(Event *event) {
 	}
 
 	if(event->getDispatcher() == frame->yesNoPopup) {
+
+		if(event->getEventType() == "UIEvent" && event->getEventCode() == UIEvent::CANCEL_EVENT) {
+			if(frame->yesNoPopup->action == "saveAndRun") {
+				runNextFrame = true;			
+			}
+			
+			frame->hideModal();
+			frame->yesNoPopup->action = "";		
+		}
+	
 		if(event->getEventType() == "UIEvent" && event->getEventCode() == UIEvent::OK_EVENT) {
 			if(frame->yesNoPopup->action == "removeFile") {
 				doRemoveFile();
 			}
+			
+			if(frame->yesNoPopup->action == "saveAndRun") {
+				editorManager->saveAll();
+				runNextFrame = true;
+			}
+			
 			frame->hideModal();
 			frame->yesNoPopup->action = "";
 		}
@@ -693,6 +722,11 @@ bool PolycodeIDEApp::Update() {
 		runProject();
 	}
 
+	if(runNextFrame) {
+		runNextFrame = false;
+		doRunProject();
+	}
+
 	if(lastConnected != debugger->isConnected()) {
 		needsRedraw = true;
 		lastConnected = debugger->isConnected();

IDE/Contents/Source/PolycodeTextEditor.cpp

@@ -283,6 +283,9 @@ PolycodeTextEditor::~PolycodeTextEditor() {
 
 bool PolycodeTextEditor::openFile(OSFileEntry filePath) {
 	
+	
+	isLoading = true;
+	
 	textInput = new UITextInput(true, 100, 100);
 	addChild(textInput);
 	textInput->setBackgroundColor(globalSyntaxTheme->bgColor);
@@ -292,6 +295,7 @@ bool PolycodeTextEditor::openFile(OSFileEntry filePath) {
 	textInput->setLineNumberColor(globalSyntaxTheme->lineNumberColor);
 	textInput->enableLineNumbers(true);
 	
+	textInput->addEventListener(this, UIEvent::CHANGE_EVENT);
 	
 	findBar = new FindBar();
 	findBar->visible = false;
@@ -319,11 +323,19 @@ bool PolycodeTextEditor::openFile(OSFileEntry filePath) {
 	delete data;
 	
 	PolycodeEditor::openFile(filePath);
+	
+	isLoading = false;	
 	return true;
 }
 
 void PolycodeTextEditor::handleEvent(Event *event) {
 
+	if(event->getDispatcher() == textInput) {
+		if(!isLoading) {
+			setHasChanges(true);
+		}
+	}
+
 	if(event->getDispatcher() == findBar->replaceAllButton) {
 		if(event->getEventType() == "UIEvent" && event->getEventCode() == UIEvent::CLICK_EVENT) {
 			textInput->replaceAll(findBar->findInput->getText(), findBar->replaceInput->getText());
@@ -399,6 +411,7 @@ void PolycodeTextEditor::saveFile() {
 	data->setFromString(textInput->getText(), String::ENCODING_UTF8);
 	data->saveToFile(filePath);
 	delete data;
+	setHasChanges(false);
 }
 
 void PolycodeTextEditor::Resize(int x, int y) {

IDE/Contents/Source/ToolWindows.cpp

@@ -114,7 +114,8 @@ void YesNoPopup::handleEvent(Event *event) {
 			}
 			
 			if(event->getDispatcher() == cancelButton) {
-				dispatchEvent(new UIEvent(), UIEvent::CLOSE_EVENT);				
+				dispatchEvent(new UIEvent(), UIEvent::CLOSE_EVENT);
+				dispatchEvent(new UIEvent(), UIEvent::CANCEL_EVENT);				
 			}									
 		}
 	}

Modules/Contents/UI/Include/PolyUIButton.h

@@ -28,6 +28,7 @@
 #include "PolyUIEvent.h"
 #include "PolyUIBox.h"
 #include "PolyUIElement.h"
+#include "PolyCoreInput.h"
 
 namespace Polycode {
 
@@ -40,6 +41,8 @@ namespace Polycode {
 			void Update();
 				
 		private:
+		
+			CoreInput *coreInput;
 			
 			Number labelXPos;
 			Number labelYPos;

Modules/Contents/UI/Source/PolyUIButton.cpp

@@ -26,6 +26,7 @@
 #include "PolyInputEvent.h"
 #include "PolyLabel.h"
 #include "PolyCoreServices.h"
+#include "PolyCore.h"
 
 using namespace Polycode;
 
@@ -63,6 +64,10 @@ UIButton::UIButton(String text, Number width, Number height) : UIElement() {
 	buttonRect->addEventListener(this, InputEvent::EVENT_MOUSEUP);
 	buttonRect->addEventListener(this, InputEvent::EVENT_MOUSEUP_OUTSIDE);	
 	buttonRect->addEventListener(this, InputEvent::EVENT_MOUSEDOWN);
+	
+	coreInput = CoreServices::getInstance()->getCore()->getInput();
+	coreInput->addEventListener(this, InputEvent::EVENT_KEYDOWN);
+		
 	pressedDown = false;
 	
 	buttonLabel = new ScreenLabel(text, fontSize, fontName, Label::ANTIALIAS_FULL);
@@ -97,6 +102,17 @@ UIButton::~UIButton() {
 }
 		
 void UIButton::handleEvent(Event *event) {
+
+	if(event->getDispatcher() == coreInput) {
+		switch(event->getEventCode()) {
+			case InputEvent::EVENT_KEYDOWN:
+				if(hasFocus) {
+					dispatchEvent(new UIEvent(), UIEvent::CLICK_EVENT);					
+				}
+			break;
+		}
+	}
+	
 	if(event->getDispatcher() == buttonRect) {
 		switch(event->getEventCode()) {
 			case InputEvent::EVENT_MOUSEOVER:

Modules/Contents/UI/Source/PolyUITextInput.cpp

@@ -1252,6 +1252,8 @@ void UITextInput::onKeyDown(PolyKEY key, wchar_t charCode) {
 	}	
 	
 	String ctext = lines[lineOffset];
+	
+	bool _changedText = false;
 		
 	if((charCode > 31 && charCode < 127) || charCode > 127) {	
 		if(!isNumberOnly || (isNumberOnly && ((charCode > 47 && charCode < 58) || (charCode == '.' || charCode == '-')))) {
@@ -1265,6 +1267,7 @@ void UITextInput::onKeyDown(PolyKEY key, wchar_t charCode) {
 			ctext = ctext.substr(0,caretPosition);
 			ctext += charCode + text2;
 			caretPosition++;
+			_changedText = true;
 		}
 	}
 	
@@ -1276,7 +1279,8 @@ void UITextInput::onKeyDown(PolyKEY key, wchar_t charCode) {
 		String text2 = ctext.substr(caretPosition, ctext.length()-caretPosition);
 		ctext = ctext.substr(0,caretPosition);
 		ctext += (wchar_t)'\t' + text2;
-		caretPosition++;		
+		caretPosition++;
+		_changedText = true;		
 	}
 	
 	if(key == KEY_BACKSPACE) {
@@ -1293,6 +1297,7 @@ void UITextInput::onKeyDown(PolyKEY key, wchar_t charCode) {
 				ctext = ctext.substr(0,caretPosition-1);
 				ctext += text2;
 				caretPosition--;
+				_changedText = true;				
 			}
 		} else {
 			if(lineOffset > 0) {
@@ -1310,7 +1315,10 @@ void UITextInput::onKeyDown(PolyKEY key, wchar_t charCode) {
 	}
 	
 	lines[lineOffset] = ctext;
-	changedText();
+	
+	if(_changedText) {
+		changedText();
+	}
 	updateCaretPosition();
 }