Просмотр исходного кода

Made IDE project always copy files. Added find option and shortcut to the menu, fixed external editor not opening paths with spaces on windows, fixed publishing on windows

Ivan Safrin 12 лет назад
Родитель
Сommit
4966c24025

+ 2 - 2
IDE/Build/Windows/Polycode.props

@@ -31,11 +31,11 @@
  <Command>if not exist "$(ProjectDir)default.pak" copy "$(PolycodeDir)Core\Assets\default.pak" "$(ProjectDir)"
 if not exist "$(ProjectDir)hdr.pak" copy "$(PolycodeDir)Core\Assets\hdr.pak" "$(ProjectDir)"
 
-if not exist "$(ProjectDir)FileTemplates" xcopy /E /Y "..\..\Contents\Resources" "$(ProjectDir)"
+xcopy /E /Y "..\..\Contents\Resources" "$(ProjectDir)"
 if not exist "$(ProjectDir)Standalone" (
   mkdir "$(ProjectDir)Standalone"
-  xcopy /E /Y "$(PolycodeDir)..\Standalone" "$(ProjectDir)Standalone"
 )
+xcopy /E /Y "$(PolycodeDir)..\Standalone" "$(ProjectDir)Standalone"
 
 if "$(ConfigurationName)" == "Debug" (
   if not exist "$(TargetDir)OpenAL32d.dll" copy "$(PolycodeDir)Core\Dependencies\bin\OpenAL32d.dll" "$(TargetDir)"

+ 6 - 3
IDE/Contents/Source/PolycodeIDEApp.cpp

@@ -31,7 +31,7 @@ PolycodeClipboard *globalClipboard;
 
 
 PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
-	core = new POLYCODE_CORE(view, 1100, 700,false,true, 0, 0,30, -1);	
+	core = new POLYCODE_CORE(view, 1100, 700,false,true, 0, 0,90, -1);	
 //	core->pauseOnLoseFocus = true;
 	
 	CoreServices::getInstance()->getResourceManager()->reloadResourcesOnModify = true;
@@ -161,10 +161,11 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 	editEntry->addItem("Redo", "redo");
 	editEntry->addItem("Cut", "cut");
 	editEntry->addItem("Copy", "copy");
+	editEntry->addItem("Find", "find", KEY_f);
 	editEntry->addItem("Settings", "settings");
 
 	UIMenuBarEntry *viewEntry = menuBar->addMenuBarEntry("View");
-	viewEntry->addItem("Toggle Console", "toggle_console", KEY_LSHIFT, KEY_c);
+	viewEntry->addItem("Toggle Console", "toggle_console", KEY_LSHIFT, KEY_t);
 
 	UIMenuBarEntry *projectEntry = menuBar->addMenuBarEntry("Project");
 	projectEntry->addItem("Run Project", "run_project", KEY_r);
@@ -624,6 +625,8 @@ void PolycodeIDEApp::handleEvent(Event *event) {
 			toggleConsole();
 		} else if(action == "settings") {
 			showSettings();
+		} else if(action == "find") {
+			findText();
 		}
 	}
 
@@ -649,7 +652,7 @@ void PolycodeIDEApp::handleEvent(Event *event) {
 				core->setFramerate(3);
 			break;		
 			case Core::EVENT_GAINED_FOCUS:
-				core->setFramerate(30);			
+				core->setFramerate(90);			
 			break;					
 			case Core::EVENT_CORE_RESIZE:
 				if(menuBar) {

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

@@ -166,7 +166,7 @@ void PolycodeProjectManager::exportProject(PolycodeProject *project, String expo
 
 	if(windows) {
 		PolycodeConsole::print("Exporting Windows version to "+exportPath+"/Win \n");
-		CoreServices::getInstance()->getCore()->copyDiskItem(publishPath+"/Win", exportPath+"/Win");
+		CoreServices::getInstance()->getCore()->copyDiskItem(publishPath+"/Win/*", exportPath+"/Win");
 		CoreServices::getInstance()->getCore()->moveDiskItem(exportPath+"/Win/StandalonePlayer.exe", exportPath+"/Win/"+project->getProjectName()+".exe");
 		CoreServices::getInstance()->getCore()->removeDiskItem(exportPath+"/Win/main.polyapp");
 		CoreServices::getInstance()->getCore()->copyDiskItem(polyappPath, exportPath+"/Win/main.polyapp");

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

@@ -114,7 +114,7 @@ void PolycodeToolLauncher::buildProject(PolycodeProject *project, String destina
 }
 
 void PolycodeToolLauncher::openExternalEditor(String app, String file, String inFolder) {
-	GenericRunner *runner = new GenericRunner(app, file, inFolder);
+	GenericRunner *runner = new GenericRunner(app, "\""+file+"\"", inFolder);
 	CoreServices::getInstance()->getCore()->createThread(runner);
 }