ソースを参照

Added 'Close File' to IDE menu in Windows and Linux, made the text editor convert Windows line endings to Unix

Ivan Safrin 12 年 前
コミット
375127e4dc

+ 1 - 1
IDE/Build/Windows/main.cpp

@@ -7,7 +7,7 @@ using namespace Polycode;
 
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
-	PolycodeView *view = new PolycodeView(hInstance, nCmdShow, L"Polycode", true, true);
+	PolycodeView *view = new PolycodeView(hInstance, nCmdShow, L"Polycode", true, false);
 	PolycodeIDEApp *app = new PolycodeIDEApp(view);
 
 	MSG Msg;

+ 4 - 0
IDE/Contents/Source/PolycodeIDEApp.cpp

@@ -145,6 +145,7 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 	fileEntry->addItem("New Folder", "new_folder", KEY_LSHIFT, KEY_f);
 	fileEntry->addItem("Open Project", "open_project", KEY_LSHIFT, KEY_o);
 	fileEntry->addItem("Close Project", "close_project", KEY_LSHIFT, KEY_w);
+	fileEntry->addItem("Close File", "close_file", KEY_w);
 	fileEntry->addItem("Remove File", "remove_file");
 	fileEntry->addItem("Refresh Project", "refresh_project");
 	fileEntry->addItem("Save File", "save_file", KEY_s);
@@ -246,6 +247,7 @@ bool PolycodeIDEApp::removeEditor(PolycodeEditor *editor) {
 			frame->showEditor(editorManager->openEditors[0]);
 		}
 	}
+	return false;
 }
 
 void PolycodeIDEApp::closeFile() {
@@ -480,6 +482,8 @@ void PolycodeIDEApp::handleEvent(Event *event) {
 			openProject();
 		} else if(action == "close_project") {
 			closeProject();
+		} else if(action == "close_file") {
+			closeFile();
 		} else if(action == "remove_file") {
 			removeFile();
 		} else if(action == "refresh_project") {

+ 1 - 1
IDE/Contents/Source/PolycodeTextEditor.cpp

@@ -477,7 +477,7 @@ bool PolycodeTextEditor::openFile(OSFileEntry filePath) {
 	
 	Data *data = new Data();
 	if(data->loadFromFile(filePath.fullPath)) {
-		textInput->setText(data->getAsString(String::ENCODING_UTF8));
+		textInput->setText(data->getAsString(String::ENCODING_UTF8).replace("\r\n", "\n"));
 	}
 	delete data;