Menu
▾
▴
[Freeorion-programmers] SF.net SVN: freeorion: [2290] trunk/FreeOrion
|
From: <geo...@us...> - 2008-01-20 02:23:18
|
Revision: 2290
http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2290&view=rev
Author: geoffthemedio
Date: 2008-01-19 18:23:21 -0800 (Sat, 19 Jan 2008)
Log Message:
-----------
-Moved all icons into subdirectories of the icon directory in default/data/art, to complete reorganization of icons that was started some time ago. (Still need to rename icon file names consistently, but too many steps at once doesn't seem to work with with subversion)
-Updated techs.txt and some hard-coded icon references accordingly
-Moved font files into the default data directory
-Updated default font location specifiers in code accordingly
Modified Paths:
--------------
trunk/FreeOrion/UI/ClientUI.cpp
trunk/FreeOrion/default/techs.txt
trunk/FreeOrion/universe/Building.cpp
trunk/FreeOrion/universe/Special.cpp
Added Paths:
-----------
trunk/FreeOrion/default/DejaVuSans-Bold.ttf
trunk/FreeOrion/default/DejaVuSans-BoldOblique.ttf
trunk/FreeOrion/default/DejaVuSans-Oblique.ttf
trunk/FreeOrion/default/DejaVuSans.ttf
trunk/FreeOrion/default/data/art/icons/building/
trunk/FreeOrion/default/data/art/icons/building/generic_building.png
trunk/FreeOrion/default/data/art/icons/specials_tiny/generic_special.png
trunk/FreeOrion/default/data/art/icons/tech/Asteroid_Mining.png
trunk/FreeOrion/default/data/art/icons/tech/Asteroid_Mining_I.png
trunk/FreeOrion/default/data/art/icons/tech/Asteroid_Mining_II.png
trunk/FreeOrion/default/data/art/icons/tech/Economic_Fluidity.png
trunk/FreeOrion/default/data/art/icons/tech/Economic_Hegemony.png
trunk/FreeOrion/default/data/art/icons/tech/Economic_Prescience.png
trunk/FreeOrion/default/data/art/icons/tech/Economic_Spectroscopy.png
trunk/FreeOrion/default/data/art/icons/tech/Enviromental_Adaptation.png
trunk/FreeOrion/default/data/art/icons/tech/Environmental_Encapsulation.png
trunk/FreeOrion/default/data/art/icons/tech/Force-Field_Assembly.png
trunk/FreeOrion/default/data/art/icons/tech/Force-Field_Harmonics.png
trunk/FreeOrion/default/data/art/icons/tech/Force_Energy_Structures.png
trunk/FreeOrion/default/data/art/icons/tech/Galactic_Exploration.png
trunk/FreeOrion/default/data/art/icons/tech/Galactic_Monetary_Policy.png
trunk/FreeOrion/default/data/art/icons/tech/Genetic_Engineering.png
trunk/FreeOrion/default/data/art/icons/tech/Genetic_Medicine.png
trunk/FreeOrion/default/data/art/icons/tech/Habitation_Domes.png
trunk/FreeOrion/default/data/art/icons/tech/Hyperspatial_Dam.png
trunk/FreeOrion/default/data/art/icons/tech/Industrial_Centre_I.png
trunk/FreeOrion/default/data/art/icons/tech/Industrial_Centre_II.png
trunk/FreeOrion/default/data/art/icons/tech/Industrial_Centre_III.png
trunk/FreeOrion/default/data/art/icons/tech/Industrial_Cloning.png
trunk/FreeOrion/default/data/art/icons/tech/Industrial_Farming.png
trunk/FreeOrion/default/data/art/icons/tech/Interstellar_Co-Production.png
trunk/FreeOrion/default/data/art/icons/tech/Interstellar_Trade.png
trunk/FreeOrion/default/data/art/icons/tech/Looking_Glass.png
trunk/FreeOrion/default/data/art/icons/tech/Market_Economics.png
trunk/FreeOrion/default/data/art/icons/tech/Matter-Energy_Conversion.png
trunk/FreeOrion/default/data/art/icons/tech/Matter-Energy_Replication.png
trunk/FreeOrion/default/data/art/icons/tech/Microgravity_Manufacturing.png
trunk/FreeOrion/default/data/art/icons/tech/N-Dimensional_Assembly.png
trunk/FreeOrion/default/data/art/icons/tech/N-Dimensional_Structures.png
trunk/FreeOrion/default/data/art/icons/tech/N-Dimensional_Subspace.png
trunk/FreeOrion/default/data/art/icons/tech/Nanotech_Cybernetics.png
trunk/FreeOrion/default/data/art/icons/tech/Nanotech_Medicine.png
trunk/FreeOrion/default/data/art/icons/tech/Nanotech_Production.png
trunk/FreeOrion/default/data/art/icons/tech/Orbital_Construction.png
trunk/FreeOrion/default/data/art/icons/tech/Orbital_Farming.png
trunk/FreeOrion/default/data/art/icons/tech/Orbital_Generation.png
trunk/FreeOrion/default/data/art/icons/tech/Orbital_Mining.png
trunk/FreeOrion/default/data/art/icons/tech/Planetary_Colonialism.png
trunk/FreeOrion/default/data/art/icons/tech/Planetary_Ecology.png
trunk/FreeOrion/default/data/art/icons/tech/Planetary_Geology.png
trunk/FreeOrion/default/data/art/icons/tech/Planned_Economics.png
trunk/FreeOrion/default/data/art/icons/tech/Singularity_Generation.png
trunk/FreeOrion/default/data/art/icons/tech/Singularity_of_Transcendence.png
trunk/FreeOrion/default/data/art/icons/tech/Stellar_Navigation.png
trunk/FreeOrion/default/data/art/icons/tech/The_Physical_Brain.png
trunk/FreeOrion/default/data/art/icons/tech/The_Theory_of_Everything.png
trunk/FreeOrion/default/data/art/icons/tech/Transcendent_Architecture.png
trunk/FreeOrion/default/data/art/icons/tech/Xenological_Genetics.png
trunk/FreeOrion/default/data/art/icons/tech/Xenological_Hybridization.png
trunk/FreeOrion/default/data/art/icons/tech/categories/
trunk/FreeOrion/default/data/art/icons/tech/categories/construction.png
trunk/FreeOrion/default/data/art/icons/tech/categories/economics.png
trunk/FreeOrion/default/data/art/icons/tech/categories/growth.png
trunk/FreeOrion/default/data/art/icons/tech/categories/learning.png
trunk/FreeOrion/default/data/art/icons/tech/categories/production.png
Removed Paths:
-------------
trunk/FreeOrion/DejaVuSans-Bold.ttf
trunk/FreeOrion/DejaVuSans-BoldOblique.ttf
trunk/FreeOrion/DejaVuSans-Oblique.ttf
trunk/FreeOrion/DejaVuSans.ttf
trunk/FreeOrion/default/data/art/building_icons/
trunk/FreeOrion/default/data/art/icons/tech/categories/construction.png
trunk/FreeOrion/default/data/art/icons/tech/categories/economics.png
trunk/FreeOrion/default/data/art/icons/tech/categories/growth.png
trunk/FreeOrion/default/data/art/icons/tech/categories/learning.png
trunk/FreeOrion/default/data/art/icons/tech/categories/production.png
trunk/FreeOrion/default/data/art/special_icons/
trunk/FreeOrion/default/data/art/tech_icons/
Deleted: trunk/FreeOrion/DejaVuSans-Bold.ttf
===================================================================
(Binary files differ)
Deleted: trunk/FreeOrion/DejaVuSans-BoldOblique.ttf
===================================================================
(Binary files differ)
Deleted: trunk/FreeOrion/DejaVuSans-Oblique.ttf
===================================================================
(Binary files differ)
Deleted: trunk/FreeOrion/DejaVuSans.ttf
===================================================================
(Binary files differ)
Modified: trunk/FreeOrion/UI/ClientUI.cpp
===================================================================
--- trunk/FreeOrion/UI/ClientUI.cpp 2008-01-19 22:06:54 UTC (rev 2289)
+++ trunk/FreeOrion/UI/ClientUI.cpp 2008-01-20 02:23:21 UTC (rev 2290)
@@ -45,11 +45,11 @@
fs::path ClientUI::ArtDir() { return GetSettingsDir() / "data" / "art"; }
fs::path ClientUI::SoundDir() { return GetSettingsDir() / "data" / "sound"; }
-std::string ClientUI::Font() { return (GetGlobalDir() / GetOptionsDB().Get<std::string>("UI.font")).native_file_string(); }
-std::string ClientUI::FontBold() { return (GetGlobalDir() / GetOptionsDB().Get<std::string>("UI.font-bold")).native_file_string(); }
-std::string ClientUI::FontItalic() { return (GetGlobalDir() / GetOptionsDB().Get<std::string>("UI.font-italic")).native_file_string(); }
-std::string ClientUI::FontBoldItalic() { return (GetGlobalDir() / GetOptionsDB().Get<std::string>("UI.font-bold-italic")).native_file_string(); }
-std::string ClientUI::TitleFont() { return (GetGlobalDir() / GetOptionsDB().Get<std::string>("UI.title-font")).native_file_string(); }
+std::string ClientUI::Font() { return (GetSettingsDir() / GetOptionsDB().Get<std::string>("UI.font")).native_file_string(); }
+std::string ClientUI::FontBold() { return (GetSettingsDir() / GetOptionsDB().Get<std::string>("UI.font-bold")).native_file_string(); }
+std::string ClientUI::FontItalic() { return (GetSettingsDir() / GetOptionsDB().Get<std::string>("UI.font-italic")).native_file_string(); }
+std::string ClientUI::FontBoldItalic() { return (GetSettingsDir() / GetOptionsDB().Get<std::string>("UI.font-bold-italic")).native_file_string(); }
+std::string ClientUI::TitleFont() { return (GetSettingsDir() / GetOptionsDB().Get<std::string>("UI.title-font")).native_file_string(); }
int ClientUI::Pts() { return GetOptionsDB().Get<int>("UI.font-size"); }
int ClientUI::TitlePts() { return GetOptionsDB().Get<int>("UI.title-font-size"); }
@@ -104,7 +104,7 @@
const BuildingType* building_type = GetBuildingType(building_type_name);
const std::string graphic_name = building_type->Graphic();
if (graphic_name.empty())
- return ClientUI::GetTexture(ArtDir() / "building_icons" / "Generic_Building.png", true);
+ return ClientUI::GetTexture(ArtDir() / "icons" / "building" / "generic_building.png", true);
return ClientUI::GetTexture(ArtDir() / graphic_name, true);
}
@@ -121,7 +121,7 @@
icon_filename = "learning.png";
if (category_name == "PRODUCTION_CATEGORY")
icon_filename = "production.png";
- return ClientUI::GetTexture(ArtDir() / "tech_icons" / "categories" / icon_filename, true);
+ return ClientUI::GetTexture(ArtDir() / "icons" / "tech/" / "categories" / icon_filename, true);
}
boost::shared_ptr<GG::Texture> ClientUI::TechTexture(const std::string& tech_name)
@@ -139,7 +139,7 @@
const Special* special = GetSpecial(special_name);
std::string texture_name = special->Graphic();
if (texture_name.empty())
- return ClientUI::GetTexture(ArtDir() / "special_icons" / "Generic_Special.png", true);
+ return ClientUI::GetTexture(ArtDir() / "icons" / "specials_tiny" / "generic_special.png", true);
return ClientUI::GetTexture(ArtDir() / texture_name);
}
Copied: trunk/FreeOrion/default/DejaVuSans-Bold.ttf (from rev 2288, trunk/FreeOrion/DejaVuSans-Bold.ttf)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/DejaVuSans-BoldOblique.ttf (from rev 2288, trunk/FreeOrion/DejaVuSans-BoldOblique.ttf)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/DejaVuSans-Oblique.ttf (from rev 2288, trunk/FreeOrion/DejaVuSans-Oblique.ttf)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/DejaVuSans.ttf (from rev 2288, trunk/FreeOrion/DejaVuSans.ttf)
===================================================================
(Binary files differ)
Added: trunk/FreeOrion/default/data/art/icons/building/generic_building.png
===================================================================
(Binary files differ)
Property changes on: trunk/FreeOrion/default/data/art/icons/building/generic_building.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/FreeOrion/default/data/art/icons/specials_tiny/generic_special.png
===================================================================
(Binary files differ)
Property changes on: trunk/FreeOrion/default/data/art/icons/specials_tiny/generic_special.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: trunk/FreeOrion/default/data/art/icons/tech/Asteroid_Mining.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Asteroid_Mining.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Asteroid_Mining_I.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Asteroid_Mining_I.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Asteroid_Mining_II.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Asteroid_Mining_II.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Economic_Fluidity.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Economic_Fluidity.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Economic_Hegemony.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Economic_Hegemony.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Economic_Prescience.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Economic_Prescience.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Economic_Spectroscopy.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Economic_Spectroscopy.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Enviromental_Adaptation.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Enviromental_Adaptation.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Environmental_Encapsulation.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Environmental_Encapsulation.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Force-Field_Assembly.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Force-Field_Assembly.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Force-Field_Harmonics.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Force-Field_Harmonics.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Force_Energy_Structures.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Force_Energy_Structures.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Galactic_Exploration.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Galactic_Exploration.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Galactic_Monetary_Policy.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Galactic_Monetary_Policy.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Genetic_Engineering.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Genetic_Engineering.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Genetic_Medicine.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Genetic_Medicine.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Habitation_Domes.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Habitation_Domes.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Hyperspatial_Dam.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Hyperspatial_Dam.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Industrial_Centre_I.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Industrial_Centre_I.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Industrial_Centre_II.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Industrial_Centre_II.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Industrial_Centre_III.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Industrial_Centre_III.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Industrial_Cloning.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Industrial_Cloning.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Industrial_Farming.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Industrial_Farming.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Interstellar_Co-Production.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Interstellar_Co-Production.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Interstellar_Trade.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Interstellar_Trade.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Looking_Glass.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Looking_Glass.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Market_Economics.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Market_Economics.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Matter-Energy_Conversion.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Matter-Energy_Conversion.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Matter-Energy_Replication.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Matter-Energy_Replication.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Microgravity_Manufacturing.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Microgravity_Manufacturing.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/N-Dimensional_Assembly.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/N-Dimensional_Assembly.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/N-Dimensional_Structures.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/N-Dimensional_Structures.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/N-Dimensional_Subspace.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/N-Dimensional_Subspace.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Nanotech_Cybernetics.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Nanotech_Cybernetics.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Nanotech_Medicine.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Nanotech_Medicine.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Nanotech_Production.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Nanotech_Production.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Orbital_Construction.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Orbital_Construction.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Orbital_Farming.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Orbital_Farming.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Orbital_Generation.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Orbital_Generation.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Orbital_Mining.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Orbital_Mining.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Planetary_Colonialism.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Planetary_Colonialism.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Planetary_Ecology.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Planetary_Ecology.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Planetary_Geology.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Planetary_Geology.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Planned_Economics.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Planned_Economics.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Singularity_Generation.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Singularity_Generation.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Singularity_of_Transcendence.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Singularity_of_Transcendence.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Stellar_Navigation.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Stellar_Navigation.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/The_Physical_Brain.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/The_Physical_Brain.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/The_Theory_of_Everything.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/The_Theory_of_Everything.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Transcendent_Architecture.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Transcendent_Architecture.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Xenological_Genetics.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Xenological_Genetics.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/Xenological_Hybridization.png (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/Xenological_Hybridization.png)
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/categories (from rev 2288, trunk/FreeOrion/default/data/art/tech_icons/categories)
Deleted: trunk/FreeOrion/default/data/art/icons/tech/categories/construction.png
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/categories/construction.png (from rev 2289, trunk/FreeOrion/default/data/art/tech_icons/categories/construction.png)
===================================================================
(Binary files differ)
Deleted: trunk/FreeOrion/default/data/art/icons/tech/categories/economics.png
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/categories/economics.png (from rev 2289, trunk/FreeOrion/default/data/art/tech_icons/categories/economics.png)
===================================================================
(Binary files differ)
Deleted: trunk/FreeOrion/default/data/art/icons/tech/categories/growth.png
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/categories/growth.png (from rev 2289, trunk/FreeOrion/default/data/art/tech_icons/categories/growth.png)
===================================================================
(Binary files differ)
Deleted: trunk/FreeOrion/default/data/art/icons/tech/categories/learning.png
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/categories/learning.png (from rev 2289, trunk/FreeOrion/default/data/art/tech_icons/categories/learning.png)
===================================================================
(Binary files differ)
Deleted: trunk/FreeOrion/default/data/art/icons/tech/categories/production.png
===================================================================
(Binary files differ)
Copied: trunk/FreeOrion/default/data/art/icons/tech/categories/production.png (from rev 2289, trunk/FreeOrion/default/data/art/tech_icons/categories/production.png)
===================================================================
(Binary files differ)
Modified: trunk/FreeOrion/default/techs.txt
===================================================================
--- trunk/FreeOrion/default/techs.txt 2008-01-19 22:06:54 UTC (rev 2289)
+++ trunk/FreeOrion/default/techs.txt 2008-01-20 02:23:21 UTC (rev 2290)
@@ -10,7 +10,7 @@
researchturns = 1
prerequisites = []
unlock = []
- graphic = "tech_icons/The_Physical_Brain.png"
+ graphic = "icons/tech/The_Physical_Brain.png"
Tech
name = "LRN_ALGO_ELEGANCE"
@@ -103,7 +103,7 @@
"LRN_TRANSLING_THT"
]
unlock = []
- graphic = "tech_icons/The_Theory_of_Everything.png"
+ graphic = "icons/tech/The_Theory_of_Everything.png"
Tech
name = "LRN_FORCE_FIELD"
@@ -118,7 +118,7 @@
"LRN_TRANSLING_THT"
]
unlock = []
- graphic = "tech_icons/Force-Field_Harmonics.png"
+ graphic = "icons/tech/Force-Field_Harmonics.png"
Tech
name = "LRN_MIND_VOID"
@@ -163,7 +163,7 @@
"LRN_GRAVITONICS"
]
unlock = []
- graphic = "tech_icons/N-Dimensional_Subspace.png"
+ graphic = "icons/tech/N-Dimensional_Subspace.png"
Tech
name = "LRN_UNIF_CONC"
@@ -196,7 +196,7 @@
"PRO_ZERO_GEN"
]
unlock = []
- graphic = "tech_icons/Singularity_of_Transcendence.png"
+ graphic = "icons/tech/Singularity_of_Transcendence.png"
Tech
name = "LRN_STELLAR_TOMOGRAPHY"
@@ -339,7 +339,7 @@
researchturns = 10
prerequisites = "LRN_TIME_MECH"
unlock = Item type = Building name = "BLD_LOOKING_GLASS"
- graphic = "tech_icons/Looking_Glass.png"
+ graphic = "icons/tech/Looking_Glass.png"
Tech
name = "LRN_MONUMENT_EXODUS"
@@ -377,7 +377,7 @@
researchturns = 1
prerequisites = []
unlock = []
- graphic = "tech_icons/Planetary_Ecology.png"
+ graphic = "icons/tech/Planetary_Ecology.png"
Tech
name = "GRO_GENETIC_ENG"
@@ -389,7 +389,7 @@
researchturns = 1
prerequisites = []
unlock = []
- graphic = "tech_icons/Genetic_Engineering.png"
+ graphic = "icons/tech/Genetic_Engineering.png"
Tech
name = "GRO_MEDICAL_PATH"
@@ -413,7 +413,7 @@
researchturns = 1
prerequisites = "GRO_PLANET_ECOL"
unlock = []
- graphic = "tech_icons/Environmental_Encapsulation.png"
+ graphic = "icons/tech/Environmental_Encapsulation.png"
Tech
name = "GRO_SYMBIOTIC_BIO"
@@ -443,7 +443,7 @@
"GRO_MEDICAL_PATH"
]
unlock = []
- graphic = "tech_icons/Genetic_Medicine.png"
+ graphic = "icons/tech/Genetic_Medicine.png"
Tech
name = "GRO_LIFECYCLE_MAN"
@@ -471,7 +471,7 @@
"SHP_GAL_EXPLO"
]
unlock = []
- graphic = "tech_icons/Xenological_Genetics.png"
+ graphic = "icons/tech/Xenological_Genetics.png"
Tech
name = "GRO_NANOTECH_MED"
@@ -486,7 +486,7 @@
"PRO_NANOTECH_PROD"
]
unlock = []
- graphic = "tech_icons/Nanotech_Medicine.png"
+ graphic = "icons/tech/Nanotech_Medicine.png"
Tech
name = "GRO_XENO_HYBRIDS"
@@ -501,7 +501,7 @@
"GRO_XENO_GENETICS"
]
unlock = []
- graphic = "tech_icons/Xenological_Hybridization.png"
+ graphic = "icons/tech/Xenological_Hybridization.png"
Tech
name = "GRO_NANO_CYBERNET"
@@ -513,7 +513,7 @@
researchturns = 20
prerequisites = "GRO_NANOTECH_MED"
unlock = []
- graphic = "tech_icons/Nanotech_Cybernetics.png"
+ graphic = "icons/tech/Nanotech_Cybernetics.png"
Tech
name = "GRO_ENERGY_META"
@@ -541,7 +541,7 @@
researchturns = 1
prerequisites = "GRO_PLANET_ECOL"
unlock = []
- graphic = "tech_icons/Industrial_Farming.png"
+ graphic = "icons/tech/Industrial_Farming.png"
Tech
name = "GRO_SELF_ROTATING_CROPS"
@@ -585,7 +585,7 @@
]
activation = Source
effects = SetMaxPopulation Target.MaxPopulation + 2
- graphic = "tech_icons/Habitation_Domes.png"
+ graphic = "icons/tech/Habitation_Domes.png"
Tech
@@ -690,7 +690,7 @@
"GRO_INDUSTY_FARM"
]
unlock = []
- graphic = "tech_icons/Orbital_Farming.png"
+ graphic = "icons/tech/Orbital_Farming.png"
Tech
name = "GRO_INDUSRY_CLONE"
@@ -705,7 +705,7 @@
"GRO_NANOTECH_MED"
]
unlock = []
- graphic = "tech_icons/Industrial_Cloning.png"
+ graphic = "icons/tech/Industrial_Cloning.png"
TechCategory "PRODUCTION_CATEGORY"
@@ -742,7 +742,7 @@
researchturns = 1
prerequisites = []
unlock = []
- graphic = "tech_icons/Microgravity_Manufacturing.png"
+ graphic = "icons/tech/Microgravity_Manufacturing.png"
Tech
name = "PRO_PLANET_GEOL"
@@ -754,7 +754,7 @@
researchturns = 1
prerequisites = []
unlock = []
- graphic = "tech_icons/Planetary_Geology.png"
+ graphic = "icons/tech/Planetary_Geology.png"
Tech
name = "PRO_ROBOTIC_PROD"
@@ -790,7 +790,7 @@
researchturns = 1
prerequisites = "PRO_ROBOTIC_PROD"
unlock = []
- graphic = "tech_icons/Nanotech_Production.png"
+ graphic = "icons/tech/Nanotech_Production.png"
Tech
name = "PRO_ORBITAL_GEN"
@@ -806,7 +806,7 @@
"PRO_FUSION_GEN"
]
unlock = []
- graphic = "tech_icons/Orbital_Generation.png"
+ graphic = "icons/tech/Orbital_Generation.png"
Tech
name = "PRO_SENTIENT_AUTOMATION"
@@ -836,7 +836,7 @@
"PRO_NANOTECH_PROD"
]
unlock = []
- graphic = "tech_icons/Force-Field_Assembly.png"
+ graphic = "icons/tech/Force-Field_Assembly.png"
Tech
name = "PRO_INTSTEL_COPRO"
@@ -848,7 +848,7 @@
researchturns = 15
prerequisites = "ECO_INTSTEL_TRADE"
unlock = []
- graphic = "tech_icons/Interstellar_Co-Production.png"
+ graphic = "icons/tech/Interstellar_Co-Production.png"
Tech
name = "PRO_NDIM_ASSMB"
@@ -863,7 +863,7 @@
"PRO_FRC_FLD_ASSMB"
]
unlock = []
- graphic = "tech_icons/N-Dimensional_Assembly.png"
+ graphic = "icons/tech/N-Dimensional_Assembly.png"
Tech
name = "PRO_SINGULAR_GEN"
@@ -879,7 +879,7 @@
"PRO_FUSION_GEN"
]
unlock = []
- graphic = "tech_icons/Singularity_Generation.png"
+ graphic = "icons/tech/Singularity_Generation.png"
Tech
name = "PRO_ZERO_GEN"
@@ -985,7 +985,7 @@
"CON_ORBITAL_CON"
]
unlock = []
- graphic = "tech_icons/Orbital_Mining.png"
+ graphic = "icons/tech/Orbital_Mining.png"
Tech
@@ -1001,7 +1001,7 @@
"PRO_PLANET_GEOL"
]
unlock = Item type = Building name = "BLD_ASTEROID_MINE"
- graphic = "tech_icons/Asteroid_Mining_I.png"
+ graphic = "icons/tech/Asteroid_Mining_I.png"
Tech
name = "PRO_ASTEROID_MINE_II"
@@ -1013,7 +1013,7 @@
researchturns = 1
prerequisites = "PRO_ASTEROID_MINE"
unlock = []
- graphic = "tech_icons/Asteroid_Mining_II.png"
+ graphic = "icons/tech/Asteroid_Mining_II.png"
Tech
name = "PRO_CORE_MINE"
@@ -1044,7 +1044,7 @@
"ECO_PLANNED_ECON"
]
unlock = Item type = Building name = "BLD_INDUSTRY_CENTRE"
- graphic = "tech_icons/Industrial_Centre_I.png"
+ graphic = "icons/tech/Industrial_Centre_I.png"
Tech
name = "PRO_INDUSTRY_CENTRE_II"
@@ -1056,7 +1056,7 @@
researchturns = 1
prerequisites = "PRO_INDUSTRY_CENTRE_I"
unlock = []
- graphic = "tech_icons/Industrial_Centre_II.png"
+ graphic = "icons/tech/Industrial_Centre_II.png"
Tech
name = "PRO_INDUSTRY_CENTRE_III"
@@ -1068,7 +1068,7 @@
researchturns = 1
prerequisites = "PRO_INDUSTRY_CENTRE_II"
unlock = []
- graphic = "tech_icons/Industrial_Centre_III.png"
+ graphic = "icons/tech/Industrial_Centre_III.png"
Tech
name = "PRO_ART_BLACK_HOLE"
@@ -1204,7 +1204,7 @@
researchturns = 20
prerequisites = "LRN_EVERYTHING"
unlock = []
- graphic = "tech_icons/Matter-Energy_Conversion.png"
+ graphic = "icons/tech/Matter-Energy_Conversion.png"
Tech
name = "PRO_MATENG_REPLIC"
@@ -1219,7 +1219,7 @@
"PRO_FRC_FLD_ASSMB"
]
unlock = []
- graphic = "tech_icons/Matter-Energy_Replication.png"
+ graphic = "icons/tech/Matter-Energy_Replication.png"
Tech
name = "PRO_HYPER_DAM"
@@ -1231,7 +1231,7 @@
researchturns = 10
prerequisites = "PRO_NDIM_ASSMB"
unlock = Item type = Building name = "BLD_HYPER_DAM"
- graphic = "tech_icons/Hyperspatial_Dam.png"
+ graphic = "icons/tech/Hyperspatial_Dam.png"
Tech
name = "PRO_MINI_SUN"
@@ -1257,7 +1257,7 @@
researchturns = 1
prerequisites = []
unlock = []
- graphic = "tech_icons/Orbital_Construction.png"
+ graphic = "icons/tech/Orbital_Construction.png"
Tech
name = "CON_ARCH_PSYCH"
@@ -1425,7 +1425,7 @@
"CON_STRC_INT_FLDS"
]
unlock = []
- graphic = "tech_icons/Force_Energy_Structures.png"
+ graphic = "icons/tech/Force_Energy_Structures.png"
Tech
name = "CON_ART_HEAVENLY"
@@ -1455,7 +1455,7 @@
"CON_GAL_INFRA"
]
unlock = []
- graphic = "tech_icons/Transcendent_Architecture.png"
+ graphic = "icons/tech/Transcendent_Architecture.png"
Tech
name = "CON_NDIM_STRC"
@@ -1470,7 +1470,7 @@
"PRO_NDIM_ASSMB"
]
unlock = []
- graphic = "tech_icons/N-Dimensional_Structures.png"
+ graphic = "icons/tech/N-Dimensional_Structures.png"
Tech
name = "CON_GRAVITY_WELLS"
@@ -1581,7 +1581,7 @@
researchturns = 5
prerequisites = []
unlock = []
- graphic = "tech_icons/Market_Economics.png"
+ graphic = "icons/tech/Market_Economics.png"
Tech
name = "ECO_PLANNED_ECON"
@@ -1593,7 +1593,7 @@
researchturns = 1
prerequisites = []
unlock = []
- graphic = "tech_icons/Planned_Economics.png"
+ graphic = "icons/tech/Planned_Economics.png"
Tech
name = "ECO_EXTERN_INTEG"
@@ -1621,7 +1621,7 @@
"LRN_ALGO_ELEGANCE"
]
unlock = []
- graphic = "tech_icons/Economic_Spectroscopy.png"
+ graphic = "icons/tech/Economic_Spectroscopy.png"
Tech
name = "ECO_INTSTEL_TRADE"
@@ -1636,7 +1636,7 @@
"ECO_MARKET_ECON"
]
unlock = []
- graphic = "tech_icons/Interstellar_Trade.png"
+ graphic = "icons/tech/Interstellar_Trade.png"
Tech
name = "ECO_ENV_ADAPTION"
@@ -1652,7 +1652,7 @@
"GRO_PLANET_ECOL"
]
unlock = []
- graphic = "tech_icons/Enviromental_Adaptation.png"
+ graphic = "icons/tech/Enviromental_Adaptation.png"
Tech
name = "ECO_GAL_MONEY_POL"
@@ -1667,7 +1667,7 @@
"ECO_INTSTEL_TRADE"
]
unlock = []
- graphic = "tech_icons/Galactic_Monetary_Policy.png"
+ graphic = "icons/tech/Galactic_Monetary_Policy.png"
Tech
name = "ECO_ECON_FLUIDITY"
@@ -1682,7 +1682,7 @@
"PRO_INTSTEL_COPRO"
]
unlock = []
- graphic = "tech_icons/Economic_Fluidity.png"
+ graphic = "icons/tech/Economic_Fluidity.png"
Tech
name = "ECO_PLANET_COLONY"
@@ -1698,7 +1698,7 @@
"ECO_INTSTEL_TRADE"
]
unlock = []
- graphic = "tech_icons/Planetary_Colonialism.png"
+ graphic = "icons/tech/Planetary_Colonialism.png"
Tech
name = "ECO_ECON_PRESCIEN"
@@ -1714,7 +1714,7 @@
"LRN_PSIONICS"
]
unlock = []
- graphic = "tech_icons/Economic_Prescience.png"
+ graphic = "icons/tech/Economic_Prescience.png"
Tech
name = "ECO_STAB_HYPGROW"
@@ -1745,7 +1745,7 @@
"ECO_STAB_HYPGROW"
]
unlock = []
- graphic = "tech_icons/Economic_Hegemony.png"
+ graphic = "icons/tech/Economic_Hegemony.png"
Tech
name = "ECO_COLONIAL_ECO"
@@ -1857,7 +1857,7 @@
researchturns = 1
prerequisites = []
unlock = []
- graphic = "tech_icons/Galactic_Exploration.png"
+ graphic = "icons/tech/Galactic_Exploration.png"
Tech
name = "SHP_NAVIGATION"
@@ -1869,7 +1869,7 @@
researchturns = 1
prerequisites = "SHP_GAL_EXPLO"
unlock = []
- graphic = "tech_icons/Stellar_Navigation.png"
+ graphic = "icons/tech/Stellar_Navigation.png"
Tech
name = "SHP_LIGHTHOUSE"
Modified: trunk/FreeOrion/universe/Building.cpp
===================================================================
--- trunk/FreeOrion/universe/Building.cpp 2008-01-19 22:06:54 UTC (rev 2289)
+++ trunk/FreeOrion/universe/Building.cpp 2008-01-20 02:23:21 UTC (rev 2290)
@@ -131,10 +131,7 @@
m_location(location),
m_effects(effects),
m_graphic(graphic)
-{
- if (m_graphic == "")
- m_graphic = "building_icons/Generic_Building.png";
-}
+{}
const std::string& BuildingType::Name() const
{
Modified: trunk/FreeOrion/universe/Special.cpp
===================================================================
--- trunk/FreeOrion/universe/Special.cpp 2008-01-19 22:06:54 UTC (rev 2289)
+++ trunk/FreeOrion/universe/Special.cpp 2008-01-20 02:23:21 UTC (rev 2290)
@@ -88,10 +88,7 @@
m_description(description),
m_effects(effects),
m_graphic(graphic)
-{
- if (m_graphic == "")
- m_graphic = "special_icons/Generic_Special.png";
-}
+{}
const std::string& Special::Name() const
{
|