From 6a5412d95c8ebf99fd9a6fe6f9bc7c8a859d2cc5 Mon Sep 17 00:00:00 2001
From: Jay Dolan <jay@jaydolan.com>
Date: Sun, 8 Mar 2015 09:55:36 -0400
Subject: [PATCH] Updates for Quake2World -> Quetoo project renaming.

---
 .project                |  6 ++++++
 .pydevproject           |  4 +---
 config.py               |  2 +-
 radiant/preferences.cpp | 26 +++++++++++++-------------
 radiant/preferences.h   |  6 +++---
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/.project b/.project
index 57cf2b9a..3c177e26 100644
--- a/.project
+++ b/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
 			<triggers>clean,full,incremental,</triggers>
@@ -23,6 +28,7 @@
 		<nature>org.eclipse.cdt.core.ccnature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.python.pydev.pythonNature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
diff --git a/.pydevproject b/.pydevproject
index a9cca037..40e9f40a 100644
--- a/.pydevproject
+++ b/.pydevproject
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
+<?eclipse-pydev version="1.0"?><pydev_project>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 </pydev_project>
diff --git a/config.py b/config.py
index 63ad8a75..f8c3662f 100644
--- a/config.py
+++ b/config.py
@@ -27,7 +27,7 @@ class Config:
         # platforms for which to assemble a setup
         self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ]
         # paks to assemble in the setup
-        self.setup_packs = [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack', 'Q2Pack', 'Q2WPack', 'JAPack', 'STVEFPack', 'WolfPack' ]
+        self.setup_packs = [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack', 'Q2Pack', 'QuetooPack', 'JAPack', 'STVEFPack', 'WolfPack' ]
 
     def __repr__( self ):
         return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )
diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 288448b1..f77e319d 100644
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -3341,7 +3341,7 @@ void CGameInstall::OnGameSelectChanged( GtkWidget *widget, gpointer data ) {
 	i->UpdateData( FALSE );
 
         int game_id = i->m_availGames[ i->m_nComboSelect ];
-        if ( game_id == GAME_Q2 || game_id == GAME_Q2W ) {
+        if ( game_id == GAME_Q2 || game_id == GAME_QUETOO ) {
           gtk_widget_show( i->m_executablesVBox );
         } else {
           gtk_widget_hide( i->m_executablesVBox );
@@ -3387,8 +3387,8 @@ void CGameInstall::BuildDialog() {
 		case GAME_UFOAI:
 			gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "UFO: Alien Invasion" ) );
 			break;
-		case GAME_Q2W:
-			gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "Quake2World" ) );
+		case GAME_QUETOO:
+			gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "Quetoo" ) );
 			break;
 		case GAME_WARSOW:
 			gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "Warsow" ) );
@@ -3523,9 +3523,9 @@ void CGameInstall::Run() {
 		gamePack = UFOAI_PACK;
 		gameFilePath += UFOAI_GAME;
 		break;
-	case GAME_Q2W:
-		gamePack = Q2W_PACK;
-		gameFilePath += Q2W_GAME;
+	case GAME_QUETOO:
+		gamePack = QUETOO_PACK;
+		gameFilePath += QUETOO_GAME;
 		break;
 	case GAME_WARSOW:
 		gameFilePath += WARSOW_GAME;
@@ -3630,13 +3630,13 @@ void CGameInstall::Run() {
 		fprintf( fg, "  no_patch=\"true\"\n" );
 		break;
 	}
-	case GAME_Q2W: {
+	case GAME_QUETOO: {
 #if defined( __APPLE__ ) || defined( __linux__ )
-		fprintf( fg, "  " ENGINE_ATTRIBUTE "=\"quake2world\"\n" );
-		fprintf( fg, "  " PREFIX_ATTRIBUTE "=\".quake2world\"\n" );
+		fprintf( fg, "  " ENGINE_ATTRIBUTE "=\"quetoo\"\n" );
+		fprintf( fg, "  " PREFIX_ATTRIBUTE "=\".quetoo\"\n" );
 #elif _WIN32
-		fprintf( fg, "  " ENGINE_ATTRIBUTE "=\"quake2world.exe\"\n" );
-		fprintf( fg, "  " PREFIX_ATTRIBUTE "=\"Quake2World\"\n" );
+		fprintf( fg, "  " ENGINE_ATTRIBUTE "=\"quetoo.exe\"\n" );
+		fprintf( fg, "  " PREFIX_ATTRIBUTE "=\"Quetoo\"\n" );
 #endif
 		fprintf( fg, "  idtech2=\"true\"\n" );
 		fprintf( fg, "  basegame=\"default\"\n" );
@@ -3769,8 +3769,8 @@ void CGameInstall::ScanGames() {
 		if ( stricmp( dirname, UFOAI_PACK ) == 0 ) {
 			m_availGames[ iGame++ ] = GAME_UFOAI;
 		}
-		if ( stricmp( dirname, Q2W_PACK ) == 0 ) {
-			m_availGames[ iGame++ ] = GAME_Q2W;
+		if ( stricmp( dirname, QUETOO_PACK ) == 0 ) {
+			m_availGames[ iGame++ ] = GAME_QUETOO;
 		}
 		if ( stricmp( dirname, WARSOW_PACK ) == 0 ) {
 			m_availGames[ iGame++ ] = GAME_WARSOW;
diff --git a/radiant/preferences.h b/radiant/preferences.h
index 79b43184..fe6e6f04 100644
--- a/radiant/preferences.h
+++ b/radiant/preferences.h
@@ -205,7 +205,7 @@ void Dump();
 #define Q3_GAME "q3.game"
 #define URT_GAME "urt.game"
 #define UFOAI_GAME "ufoai.game"
-#define Q2W_GAME "q2w.game"
+#define QUETOO_GAME "quetoo.game"
 #define WARSOW_GAME "warsow.game"
 #define NEXUIZ_GAME "nexuiz.game"
 #define Q2_GAME "q2.game"
@@ -220,7 +220,7 @@ void Dump();
 #define Q3_PACK "Q3Pack"
 #define URT_PACK "UrTPack"
 #define UFOAI_PACK "UFOAIPack"
-#define Q2W_PACK "Q2WPack"
+#define QUETOO_PACK "QuetooPack"
 #define WARSOW_PACK "WarsowPack"
 #define NEXUIZ_PACK "NexuizPack"
 #define Q2_PACK "Q2Pack"
@@ -248,7 +248,7 @@ public:
 	GAME_Q3 = 1,
 	GAME_URT,
 	GAME_UFOAI,
-	GAME_Q2W,
+	GAME_QUETOO,
 	GAME_WARSOW,
 	GAME_NEXUIZ,
 	GAME_Q2,