[haiku-commits] haiku: hrev43713 - data/catalogs/preferences/3drendering data/catalogs/preferences/opengl src/preferences/3drendering src/preferences/opengl
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 3 Feb 2012 00:10:24 +0100 (CET)
hrev43713 adds 1 changeset to branch 'master'
old head: 2543ef4c34ed1e968e34415e7d2bceeef6a0a350
new head: 64629da6393c9602297042f118f9d0c110e60a12
----------------------------------------------------------------------------
64629da: 3DRender preferences: Remove OpenGL text
* Prevent trademark issues with "OpenGL" text.
* Rename OpenGL preference pane "3D Rendering"
* Update catkeys
* Add a better image to 3D Rendering preferences
(we can change this if there are objections, just
trying to pretty the pane up a little)
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev43713
Commit: 64629da6393c9602297042f118f9d0c110e60a12
URL: http://cgit.haiku-os.org/haiku/commit/?id=64629da
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Thu Feb 2 17:04:11 2012 UTC
----------------------------------------------------------------------------
47 files changed, 76 insertions(+), 76 deletions(-)
build/jam/HaikuImage | 2 +-
.../preferences/{opengl => 3drendering}/be.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/cs.catkeys | 4 ++--
.../preferences/{opengl => 3drendering}/de.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/el.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/eo.catkeys | 2 +-
.../preferences/{opengl => 3drendering}/es.catkeys | 2 +-
.../preferences/{opengl => 3drendering}/fi.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/fr.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/hr.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/hu.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/it.catkeys | 4 ++--
.../preferences/{opengl => 3drendering}/ja.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/ko.catkeys | 2 +-
.../preferences/{opengl => 3drendering}/lt.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/nb.catkeys | 4 ++--
.../preferences/{opengl => 3drendering}/nl.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/pl.catkeys | 4 ++--
.../preferences/{opengl => 3drendering}/pt.catkeys | 4 ++--
.../{opengl => 3drendering}/pt_br.catkeys | 2 +-
.../preferences/{opengl => 3drendering}/ro.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/ru.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/sk.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/sv.catkeys | 6 +++---
.../preferences/{opengl => 3drendering}/uk.catkeys | 6 +++---
.../{opengl => 3drendering}/zh-Hans.catkeys | 6 +++---
.../OpenGL.rdef => 3drendering/3DRendering.rdef} | 8 ++++----
.../{opengl => 3drendering}/CapabilitiesView.cpp | 0
.../{opengl => 3drendering}/CapabilitiesView.h | 0
.../{opengl => 3drendering}/ExtensionsList.cpp | 0
.../{opengl => 3drendering}/ExtensionsList.h | 0
.../{opengl => 3drendering}/ExtensionsView.cpp | 0
.../{opengl => 3drendering}/ExtensionsView.h | 0
.../{opengl => 3drendering}/InfoView.cpp | 2 +-
src/preferences/{opengl => 3drendering}/InfoView.h | 0
src/preferences/{opengl => 3drendering}/Jamfile | 10 +++++-----
.../{opengl => 3drendering}/LogoView.cpp | 0
src/preferences/{opengl => 3drendering}/LogoView.h | 0
.../{opengl => 3drendering}/OpenGLApp.cpp | 2 +-
.../{opengl => 3drendering}/OpenGLApp.h | 0
.../{opengl => 3drendering}/OpenGLView.cpp | 0
.../{opengl => 3drendering}/OpenGLView.h | 0
.../{opengl => 3drendering}/OpenGLWindow.cpp | 2 +-
.../{opengl => 3drendering}/OpenGLWindow.h | 0
src/preferences/3drendering/logo.png | Bin 0 -> 14773 bytes
src/preferences/Jamfile | 2 +-
src/preferences/opengl/logo.png | Bin 3482 -> 0 bytes
----------------------------------------------------------------------------
diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 0c6929a..d0f8c09 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -74,7 +74,7 @@ SYSTEM_APPS = AboutSystem ActivityMonitor
$(X86_ONLY)BootManager CharacterMap
;
SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations
<preference>Deskbar E-mail FileTypes Fonts Keyboard Keymap Locale Media
- Mouse Network Notifications $(X86_ONLY)OpenGL Printers Screen
ScreenSaver
+ Mouse Network Notifications $(X86_ONLY)3DRendering Printers Screen
ScreenSaver
Shortcuts Sounds Time Touchpad <preference>Tracker VirtualMemory
;
SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo $(X86_ONLY)GLTeapot
diff --git a/data/catalogs/preferences/opengl/be.catkeys
b/data/catalogs/preferences/3drendering/be.catkeys
similarity index 93%
rename from data/catalogs/preferences/opengl/be.catkeys
rename to data/catalogs/preferences/3drendering/be.catkeys
index 6bbbff2..f40cb26 100644
--- a/data/catalogs/preferences/opengl/be.catkeys
+++ b/data/catalogs/preferences/3drendering/be.catkeys
@@ -1,4 +1,4 @@
-1 belarusian x-vnd.Haiku-OpenGL 209187778
+1 belarusian x-vnd.Haiku-3DRendering 209187778
List stack size: Capabilities Памер стэку спісаў:
Information InfoView Інфармацыя
Max. clipping planes: Capabilities Макс. колькасць плоскасцяў
адсячэння:
@@ -6,9 +6,9 @@ Max. texture units: Capabilities Макс. колькасць
тэкстурн
Renderer name: InfoView Імя адлюстравальніка:
Vendor name: InfoView Імя пастаўшчыка:
Attributes stack size: Capabilities Памер стэку атрыбутаў:
-OpenGL version: InfoView Версія OpenGL:
+GL version: InfoView Версія GL:
Name stack size: Capabilities Памер стэку імёнаў:
-OpenGL System name OpenGL
+3D Rendering System name 3D Rendering
Auxiliary buffer(s): Capabilities Дапаможны(я) буфер(ы)
Max. recommended vertex elements: Capabilities Макс.
рэкамендаваная колькасць вяршынных элементаў:
GLU version: InfoView Версія GLU:
diff --git a/data/catalogs/preferences/opengl/cs.catkeys
b/data/catalogs/preferences/3drendering/cs.catkeys
similarity index 94%
rename from data/catalogs/preferences/opengl/cs.catkeys
rename to data/catalogs/preferences/3drendering/cs.catkeys
index 097e924..b514464 100644
--- a/data/catalogs/preferences/opengl/cs.catkeys
+++ b/data/catalogs/preferences/3drendering/cs.catkeys
@@ -1,4 +1,4 @@
-1 czech x-vnd.Haiku-OpenGL 899836772
+1 czech x-vnd.Haiku-3DRendering 899836772
Attributes stack size: Capabilities Velikost zásobníku atributů:
Auxiliary buffer(s): Capabilities Pomocný/é buffer(y):
Available Extensions Dostupné
@@ -19,7 +19,7 @@ Max. recommended vertex elements: Capabilities
Max. doporučených vrcholových
Max. texture units: Capabilities Max. jednotek textur:
Model stack size: Capabilities Velikost zásobníku modelů:
Name stack size: Capabilities Velikost zásobníku jmen:
-OpenGL version: InfoView Verze OpenGL:
+GL version: InfoView Verze GL:
Projection stack size: Capabilities Velikost zásobníku projekce:
Renderer name: InfoView Jméno vykreslovače:
Texture stack size: Capabilities Velikost zásobníku textur:
diff --git a/data/catalogs/preferences/opengl/de.catkeys
b/data/catalogs/preferences/3drendering/de.catkeys
similarity index 91%
rename from data/catalogs/preferences/opengl/de.catkeys
rename to data/catalogs/preferences/3drendering/de.catkeys
index adb8abb..22be027 100644
--- a/data/catalogs/preferences/opengl/de.catkeys
+++ b/data/catalogs/preferences/3drendering/de.catkeys
@@ -1,4 +1,4 @@
-1 german x-vnd.Haiku-OpenGL 209187778
+1 german x-vnd.Haiku-3DRendering 209187778
List stack size: Capabilities Listen-Stackgröße:
Information InfoView Informationen
Max. clipping planes: Capabilities Max. Clipping-Ebenen:
@@ -6,9 +6,9 @@ Max. texture units: Capabilities Max.
Textur-Einheiten:
Renderer name: InfoView Renderer-Name:
Vendor name: InfoView Herstellername:
Attributes stack size: Capabilities Attribut-Stackgröße:
-OpenGL version: InfoView OpenGL-Version:
+GL version: InfoView GL-Version:
Name stack size: Capabilities Namen-Stackgröße:
-OpenGL System name OpenGL
+3D Rendering System name 3D Rendering
Auxiliary buffer(s): Capabilities Auxiliary-Buffer:
Max. recommended vertex elements: Capabilities Max. empfohlene
Vertexelemente:
GLU version: InfoView GLU-Version:
diff --git a/data/catalogs/preferences/opengl/el.catkeys
b/data/catalogs/preferences/3drendering/el.catkeys
similarity index 93%
rename from data/catalogs/preferences/opengl/el.catkeys
rename to data/catalogs/preferences/3drendering/el.catkeys
index d8d2abe..4c03d5f 100644
--- a/data/catalogs/preferences/opengl/el.catkeys
+++ b/data/catalogs/preferences/3drendering/el.catkeys
@@ -1,4 +1,4 @@
-1 modern_greek x-vnd.Haiku-OpenGL 209187778
+1 modern_greek x-vnd.Haiku-3DRendering 209187778
Attributes stack size: Capabilities Μέγεθος στοίβας ιδιοτήτων:
Auxiliary buffer(s): Capabilities Βοηθητική ενδιάμεση μνήμη(-ες):
Available Extensions Διαθέσιμο
@@ -19,8 +19,8 @@ Max. recommended vertex elements: Capabilities
Μέγιστος αριθμός
Max. texture units: Capabilities Μέγιστος αριθμός υφών:
Model stack size: Capabilities Μέγεθος στοίβας μοντέλου:
Name stack size: Capabilities Μέγεθος στοίβας ονόματος:
-OpenGL System name OpenGL
-OpenGL version: InfoView Έκδοση OpenGL:
+3D Rendering System name 3D Rendering
+GL version: InfoView Έκδοση GL:
Projection stack size: Capabilities Μέγεθος στοίβας προβολής:
Renderer name: InfoView Όνομα αποτυπωτή:
Texture stack size: Capabilities Μέγεθος στοίβας υφών:
diff --git a/data/catalogs/preferences/opengl/eo.catkeys
b/data/catalogs/preferences/3drendering/eo.catkeys
similarity index 96%
rename from data/catalogs/preferences/opengl/eo.catkeys
rename to data/catalogs/preferences/3drendering/eo.catkeys
index 83ca747..195c313 100644
--- a/data/catalogs/preferences/opengl/eo.catkeys
+++ b/data/catalogs/preferences/3drendering/eo.catkeys
@@ -1,4 +1,4 @@
-1 esperanto x-vnd.Haiku-OpenGL 899836772
+1 esperanto x-vnd.Haiku-3DRendering 899836772
Attributes stack size: Capabilities Atributstaka grandeco:
Auxiliary buffer(s): Capabilities Helpanta(j) bufro(j):
Available Extensions Haveblaj
diff --git a/data/catalogs/preferences/opengl/es.catkeys
b/data/catalogs/preferences/3drendering/es.catkeys
similarity index 97%
rename from data/catalogs/preferences/opengl/es.catkeys
rename to data/catalogs/preferences/3drendering/es.catkeys
index a32e8e5..cad5c33 100644
--- a/data/catalogs/preferences/opengl/es.catkeys
+++ b/data/catalogs/preferences/3drendering/es.catkeys
@@ -1,4 +1,4 @@
-1 spanish x-vnd.Haiku-OpenGL 899836772
+1 spanish x-vnd.Haiku-3DRendering 899836772
Attributes stack size: Capabilities Tamaño de pila de atributos:
Auxiliary buffer(s): Capabilities Búfer(es) auxiliares:
Available Extensions Disponible
diff --git a/data/catalogs/preferences/opengl/fi.catkeys
b/data/catalogs/preferences/3drendering/fi.catkeys
similarity index 91%
rename from data/catalogs/preferences/opengl/fi.catkeys
rename to data/catalogs/preferences/3drendering/fi.catkeys
index 89fc06f..c6130fa 100644
--- a/data/catalogs/preferences/opengl/fi.catkeys
+++ b/data/catalogs/preferences/3drendering/fi.catkeys
@@ -1,4 +1,4 @@
-1 finnish x-vnd.Haiku-OpenGL 209187778
+1 finnish x-vnd.Haiku-3DRendering 209187778
Attributes stack size: Capabilities Attribuuttipinokoko:
Auxiliary buffer(s): Capabilities Apupuskuri(t):
Available Extensions Käytettävissä oleva
@@ -19,8 +19,8 @@ Max. recommended vertex elements: Capabilities
Suositeltujen vertex-elementtien
Max. texture units: Capabilities Maksimitekstuuriyksiköt:
Model stack size: Capabilities Mallipinokoko:
Name stack size: Capabilities Nimipinokoko:
-OpenGL System name OpenGL-asetukset
-OpenGL version: InfoView OpenGL-versio:
+3D Rendering System name 3D Rendering
+GL version: InfoView GL-versio:
Projection stack size: Capabilities Projektiopinokoko:
Renderer name: InfoView Renderointinimi:
Texture stack size: Capabilities Tekstuuripinokoko:
diff --git a/data/catalogs/preferences/opengl/fr.catkeys
b/data/catalogs/preferences/3drendering/fr.catkeys
similarity index 89%
rename from data/catalogs/preferences/opengl/fr.catkeys
rename to data/catalogs/preferences/3drendering/fr.catkeys
index 9e18938..e5e4549 100644
--- a/data/catalogs/preferences/opengl/fr.catkeys
+++ b/data/catalogs/preferences/3drendering/fr.catkeys
@@ -1,13 +1,13 @@
-1 french x-vnd.Haiku-OpenGL 953276299
+1 french x-vnd.Haiku-3DRendering 953276299
List stack size: Capabilities Taille de la pile de listes :
Information InfoView Informations
Max. clipping planes: Capabilities Nombre de plans de coupes :
Renderer name: InfoView Nom du moteur de rendu :
Vendor name: InfoView Nom du vendeur :
Attributes stack size: Capabilities Taille de la pile d'attributs :
-OpenGL version: InfoView Version d'OpenGL :
+GL version: InfoView Version d'GL :
Name stack size: Capabilities Taille de la pile de noms :
-OpenGL System name OpenGL
+3D Rendering System name 3D Rendering
Auxiliary buffer(s): Capabilities Tampon(s) auxilliaire(s) :
GLU version: InfoView Version de GLU :
Model stack size: Capabilities Taille de la pile de modèles :
diff --git a/data/catalogs/preferences/opengl/hr.catkeys
b/data/catalogs/preferences/3drendering/hr.catkeys
similarity index 87%
rename from data/catalogs/preferences/opengl/hr.catkeys
rename to data/catalogs/preferences/3drendering/hr.catkeys
index 1b4d8b5..16ca0d2 100644
--- a/data/catalogs/preferences/opengl/hr.catkeys
+++ b/data/catalogs/preferences/3drendering/hr.catkeys
@@ -1,4 +1,4 @@
-1 croatian x-vnd.Haiku-OpenGL 69309664
+1 croatian x-vnd.Haiku-3DRendering 69309664
Auxiliary buffer(s): Capabilities Pomoćna međumemorija(e):
Available Extensions Dostupno
Capabilities Capabilities Mogućnosti
@@ -13,7 +13,7 @@ Max. lights: Capabilities Max. svijetla:
Max. recommended index elements: Capabilities Maksimalni
preporučeni elementi indeksa:
Max. recommended vertex elements: Capabilities Max. dozvoljeni
broj vertex elemenata:
Max. texture units: Capabilities Max. veličine tekskture:
-OpenGL System name OpenGL
-OpenGL version: InfoView OpenGL verzija
+3D Rendering System name 3D Rendering
+GL version: InfoView GL verzija
Renderer name: InfoView Ime renderera:
Vendor name: InfoView Naziv proizvođaća:
diff --git a/data/catalogs/preferences/opengl/hu.catkeys
b/data/catalogs/preferences/3drendering/hu.catkeys
similarity index 92%
rename from data/catalogs/preferences/opengl/hu.catkeys
rename to data/catalogs/preferences/3drendering/hu.catkeys
index 1fa0f5a..4a3f4de 100644
--- a/data/catalogs/preferences/opengl/hu.catkeys
+++ b/data/catalogs/preferences/3drendering/hu.catkeys
@@ -1,4 +1,4 @@
-1 hungarian x-vnd.Haiku-OpenGL 209187778
+1 hungarian x-vnd.Haiku-3DRendering 209187778
Attributes stack size: Capabilities Attribútumok veremmérete:
Auxiliary buffer(s): Capabilities Segédpufferek száma:
Available Extensions Elérhető
@@ -19,8 +19,8 @@ Max. recommended vertex elements: Capabilities
Maximálisan ajánlott csúcspon
Max. texture units: Capabilities Legtöbb elérhető textúrázó
egységek száma:
Model stack size: Capabilities Modellverem mérete:
Name stack size: Capabilities Névverem mérete:
-OpenGL System name OpenGL
-OpenGL version: InfoView OpenGL-verzió:
+3D Rendering System name 3D Rendering
+GL version: InfoView GL-verzió:
Projection stack size: Capabilities Vetítési verem mérete:
Renderer name: InfoView Renderelő neve:
Texture stack size: Capabilities Textúraverem mérete:
diff --git a/data/catalogs/preferences/opengl/it.catkeys
b/data/catalogs/preferences/3drendering/it.catkeys
similarity index 94%
rename from data/catalogs/preferences/opengl/it.catkeys
rename to data/catalogs/preferences/3drendering/it.catkeys
index 4bdc69d..5dfb484 100644
--- a/data/catalogs/preferences/opengl/it.catkeys
+++ b/data/catalogs/preferences/3drendering/it.catkeys
@@ -1,4 +1,4 @@
-1 italian x-vnd.Haiku-OpenGL 899836772
+1 italian x-vnd.Haiku-3DRendering 899836772
Attributes stack size: Capabilities Dimensione stack attributi:
Auxiliary buffer(s): Capabilities Buffer ausiliario/i:
Available Extensions Disponibile
@@ -19,7 +19,7 @@ Max. recommended vertex elements: Capabilities
Numero massimo elementi per vert
Max. texture units: Capabilities Max. unità di texture:
Model stack size: Capabilities Dimensione stack modelli:
Name stack size: Capabilities Dimensione stack nomi:
-OpenGL version: InfoView Versione OpenGL:
+GL version: InfoView Versione GL:
Projection stack size: Capabilities Dimensione stack proiezioni:
Renderer name: InfoView Nome renderer:
Texture stack size: Capabilities Dimensione stack texture:
diff --git a/data/catalogs/preferences/opengl/ja.catkeys
b/data/catalogs/preferences/3drendering/ja.catkeys
similarity index 91%
rename from data/catalogs/preferences/opengl/ja.catkeys
rename to data/catalogs/preferences/3drendering/ja.catkeys
index ab2fd0b..3209676 100644
--- a/data/catalogs/preferences/opengl/ja.catkeys
+++ b/data/catalogs/preferences/3drendering/ja.catkeys
@@ -1,4 +1,4 @@
-1 japanese x-vnd.Haiku-OpenGL 209187778
+1 japanese x-vnd.Haiku-3DRendering 209187778
Attributes stack size: Capabilities 属性スタックサイズ:
Auxiliary buffer(s): Capabilities 補助バッファ数:
Available Extensions 利用可能
@@ -19,8 +19,8 @@ Max. recommended vertex elements: Capabilities
最大推奨頂点要素数:
Max. texture units: Capabilities 最大テクスチャユニット数:
Model stack size: Capabilities モデルスタックサイズ:
Name stack size: Capabilities ネームスタックサイズ:
-OpenGL System name OpenGL
-OpenGL version: InfoView OpenGL バージョン:
+3D Rendering System name 3D Rendering
+GL version: InfoView GL バージョン:
Projection stack size: Capabilities 投影変換スタックサイズ:
Renderer name: InfoView レンダラ名:
Texture stack size: Capabilities テクスチャスタックサイズ:
diff --git a/data/catalogs/preferences/opengl/ko.catkeys
b/data/catalogs/preferences/3drendering/ko.catkeys
similarity index 96%
rename from data/catalogs/preferences/opengl/ko.catkeys
rename to data/catalogs/preferences/3drendering/ko.catkeys
index 702da5a..ee600a4 100644
--- a/data/catalogs/preferences/opengl/ko.catkeys
+++ b/data/catalogs/preferences/3drendering/ko.catkeys
@@ -1,4 +1,4 @@
-1 korean x-vnd.Haiku-OpenGL 1539891217
+1 korean x-vnd.Haiku-3DRendering 1539891217
Attributes stack size: Capabilities 속성 스택 크기:
Auxiliary buffer(s): Capabilities 보조 버퍼(들):
Available Extensions 가능한 것
diff --git a/data/catalogs/preferences/opengl/lt.catkeys
b/data/catalogs/preferences/3drendering/lt.catkeys
similarity index 91%
rename from data/catalogs/preferences/opengl/lt.catkeys
rename to data/catalogs/preferences/3drendering/lt.catkeys
index 1e79232..42e5a6b 100644
--- a/data/catalogs/preferences/opengl/lt.catkeys
+++ b/data/catalogs/preferences/3drendering/lt.catkeys
@@ -1,13 +1,13 @@
-1 lithuanian x-vnd.Haiku-OpenGL 2272708382
+1 lithuanian x-vnd.Haiku-3DRendering 2272708382
List stack size: Capabilities Sąrašo dėklo dydis:
Information InfoView Aprašymas
Max. texture units: Capabilities Daugiausia tekstūrinių vienetų:
Renderer name: InfoView Atvaizdavimas:
Vendor name: InfoView Gamintojas:
Attributes stack size: Capabilities Požymių dėklo dydis:
-OpenGL version: InfoView OpenGL versija:
+GL version: InfoView GL versija:
Name stack size: Capabilities Vardų dėklo dydis:
-OpenGL System name OpenGL
+3D Rendering System name 3D Rendering
Auxiliary buffer(s): Capabilities Pagalbinis buferis (-iai):
Max. recommended vertex elements: Capabilities Daugiausia
siūlomų viršūnių dėmenų:
GLU version: InfoView GLU versija:
diff --git a/data/catalogs/preferences/opengl/nb.catkeys
b/data/catalogs/preferences/3drendering/nb.catkeys
similarity index 75%
rename from data/catalogs/preferences/opengl/nb.catkeys
rename to data/catalogs/preferences/3drendering/nb.catkeys
index 7816963..f19871c 100644
--- a/data/catalogs/preferences/opengl/nb.catkeys
+++ b/data/catalogs/preferences/3drendering/nb.catkeys
@@ -1,4 +1,4 @@
-1 norwegian_bokmål x-vnd.Haiku-OpenGL 3072494734
+1 norwegian_bokmål x-vnd.Haiku-3DRendering 3072494734
Available Extensions Tilgjengelig
Extensions Extensions Utvidelser
GLU version: InfoView GLU-versjon:
@@ -6,4 +6,4 @@ GLUT API version: InfoView GLUT
API-versjon:
Information InfoView Informasjon
Max. 2D texture size: Capabilities Maks. 2D teksturstørrelse:
Max. lights: Capabilities Maks. lys:
-OpenGL System name OpenGL
+3D Rendering System name 3D Rendering
diff --git a/data/catalogs/preferences/opengl/nl.catkeys
b/data/catalogs/preferences/3drendering/nl.catkeys
similarity index 90%
rename from data/catalogs/preferences/opengl/nl.catkeys
rename to data/catalogs/preferences/3drendering/nl.catkeys
index 2b49318..85a41f0 100644
--- a/data/catalogs/preferences/opengl/nl.catkeys
+++ b/data/catalogs/preferences/3drendering/nl.catkeys
@@ -1,4 +1,4 @@
-1 dutch; flemish x-vnd.Haiku-OpenGL 209187778
+1 dutch; flemish x-vnd.Haiku-3DRendering 209187778
List stack size: Capabilities Lijst stackgrootte:
Information InfoView Informatie
Max. clipping planes: Capabilities Max. clippingvlakken:
@@ -6,9 +6,9 @@ Max. texture units: Capabilities Max.
textuurunits:
Renderer name: InfoView Renderernaam:
Vendor name: InfoView Vendor-naam:
Attributes stack size: Capabilities Stackgrootte-kenmerken:
-OpenGL version: InfoView OpenGL-versie:
+GL version: InfoView GL-versie:
Name stack size: Capabilities Naam stackgrootte:
-OpenGL System name OpenGL
+3D Rendering System name 3D Rendering
Auxiliary buffer(s): Capabilities Hulpbuffer(s):
Max. recommended vertex elements: Capabilities Max. aanbevolen
vertex-elementen:
GLU version: InfoView GLU versie:
diff --git a/data/catalogs/preferences/opengl/pl.catkeys
b/data/catalogs/preferences/3drendering/pl.catkeys
similarity index 94%
rename from data/catalogs/preferences/opengl/pl.catkeys
rename to data/catalogs/preferences/3drendering/pl.catkeys
index 03402bd..b6a1e77 100644
--- a/data/catalogs/preferences/opengl/pl.catkeys
+++ b/data/catalogs/preferences/3drendering/pl.catkeys
@@ -1,4 +1,4 @@
-1 polish x-vnd.Haiku-OpenGL 899836772
+1 polish x-vnd.Haiku-3DRendering 899836772
Attributes stack size: Capabilities Rozmiar stosu atrybutów:
Auxiliary buffer(s): Capabilities Bufor(y) pomocnicze:
Available Extensions Dostępne
@@ -19,7 +19,7 @@ Max. recommended vertex elements: Capabilities
Maks. rekomendowana liczba eleme
Max. texture units: Capabilities Maks. liczba jednostek
teksturujących:
Model stack size: Capabilities Rozmiar stosu modelu:
Name stack size: Capabilities Rozmiar stosu nazw:
-OpenGL version: InfoView Wersja OpenGL:
+GL version: InfoView Wersja GL:
Projection stack size: Capabilities Rozmiar stosu projekcji:
Renderer name: InfoView Nazwa renderera:
Texture stack size: Capabilities Rozmiar stosu tekstur:
diff --git a/data/catalogs/preferences/opengl/pt.catkeys
b/data/catalogs/preferences/3drendering/pt.catkeys
similarity index 94%
rename from data/catalogs/preferences/opengl/pt.catkeys
rename to data/catalogs/preferences/3drendering/pt.catkeys
index 7484350..c727d54 100644
--- a/data/catalogs/preferences/opengl/pt.catkeys
+++ b/data/catalogs/preferences/3drendering/pt.catkeys
@@ -1,4 +1,4 @@
-1 portuguese x-vnd.Haiku-OpenGL 899836772
+1 portuguese x-vnd.Haiku-3DRendering 899836772
Attributes stack size: Capabilities Tamanho da pilha de atributos:
Auxiliary buffer(s): Capabilities Memória(s) temporária(s)
auxiliar(es):
Available Extensions Disponível
@@ -19,7 +19,7 @@ Max. recommended vertex elements: Capabilities
Número de elementos de vertíce
Max. texture units: Capabilities Número de unidades de texturas:
Model stack size: Capabilities Tamanho da pilha de modelos:
Name stack size: Capabilities Tamanho da pilha de nomes:
-OpenGL version: InfoView Versão do OpenGL:
+GL version: InfoView Versão do GL:
Projection stack size: Capabilities Tamanho da pilha de projecção:
Renderer name: InfoView Nome do renderizador:
Texture stack size: Capabilities Tamanho da pilha de texturas:
diff --git a/data/catalogs/preferences/opengl/pt_br.catkeys
b/data/catalogs/preferences/3drendering/pt_br.catkeys
similarity index 89%
rename from data/catalogs/preferences/opengl/pt_br.catkeys
rename to data/catalogs/preferences/3drendering/pt_br.catkeys
index 79d8b84..aaf4cdd 100644
--- a/data/catalogs/preferences/opengl/pt_br.catkeys
+++ b/data/catalogs/preferences/3drendering/pt_br.catkeys
@@ -1,4 +1,4 @@
-1 brazilian_portuguese x-vnd.Haiku-OpenGL 1627733364
+1 brazilian_portuguese x-vnd.Haiku-3DRendering 1627733364
Capabilities Capabilities Capacidades
Max. 2D texture size: Capabilities Tamanho máximo de texturas 2D:
Max. 3D texture size: Capabilities Tamanho máxido de texturas 3D:
diff --git a/data/catalogs/preferences/opengl/ro.catkeys
b/data/catalogs/preferences/3drendering/ro.catkeys
similarity index 92%
rename from data/catalogs/preferences/opengl/ro.catkeys
rename to data/catalogs/preferences/3drendering/ro.catkeys
index abcd9f1..2e12925 100644
--- a/data/catalogs/preferences/opengl/ro.catkeys
+++ b/data/catalogs/preferences/3drendering/ro.catkeys
@@ -1,4 +1,4 @@
-1 romanian x-vnd.Haiku-OpenGL 209187778
+1 romanian x-vnd.Haiku-3DRendering 209187778
List stack size: Capabilities Dimensiunea stivei de liste:
Information InfoView Informații
Max. clipping planes: Capabilities Numărul max. de planuri de
tăiere:
@@ -6,9 +6,9 @@ Max. texture units: Capabilities Numărul max. de
unități de textură:
Renderer name: InfoView Nume randor:
Vendor name: InfoView Nume vânzător:
Attributes stack size: Capabilities Dimensiunea stivei de atribute:
-OpenGL version: InfoView Versiune OpenGL:
+GL version: InfoView Versiune GL:
Name stack size: Capabilities Dimensiunea stivei de nume:
-OpenGL System name OpenGL
+3D Rendering System name 3D Rendering
Auxiliary buffer(s): Capabilities Amortizor(oare) auxiliar(e):
Max. recommended vertex elements: Capabilities Numărul max.
recomandat de elemente de zenit:
GLU version: InfoView Versiune GLU:
diff --git a/data/catalogs/preferences/opengl/ru.catkeys
b/data/catalogs/preferences/3drendering/ru.catkeys
similarity index 93%
rename from data/catalogs/preferences/opengl/ru.catkeys
rename to data/catalogs/preferences/3drendering/ru.catkeys
index a4049a0..b0a8166 100644
--- a/data/catalogs/preferences/opengl/ru.catkeys
+++ b/data/catalogs/preferences/3drendering/ru.catkeys
@@ -1,4 +1,4 @@
-1 russian x-vnd.Haiku-OpenGL 209187778
+1 russian x-vnd.Haiku-3DRendering 209187778
List stack size: Capabilities Размер стека списка:
Information InfoView Информация
Max. clipping planes: Capabilities Максимальное количество
отсечений:
@@ -6,9 +6,9 @@ Max. texture units: Capabilities Максимальное
количество
Renderer name: InfoView Название рендера:
Vendor name: InfoView Имя поставщика:
Attributes stack size: Capabilities Размер стека атрибутов:
-OpenGL version: InfoView Версия OpenGL:
+GL version: InfoView Версия GL:
Name stack size: Capabilities Размер стекового имени:
-OpenGL System name OpenGL
+3D Rendering System name 3D Rendering
Auxiliary buffer(s): Capabilities Вспомогательных буферов:
Max. recommended vertex elements: Capabilities Максимальное
рекомендованное количество вершин:
GLU version: InfoView Версия GLU:
diff --git a/data/catalogs/preferences/opengl/sk.catkeys
b/data/catalogs/preferences/3drendering/sk.catkeys
similarity index 92%
rename from data/catalogs/preferences/opengl/sk.catkeys
rename to data/catalogs/preferences/3drendering/sk.catkeys
index 63de3e1..474ccc8 100644
--- a/data/catalogs/preferences/opengl/sk.catkeys
+++ b/data/catalogs/preferences/3drendering/sk.catkeys
@@ -1,4 +1,4 @@
-1 slovak x-vnd.Haiku-OpenGL 209187778
+1 slovak x-vnd.Haiku-3DRendering 209187778
List stack size: Capabilities Veľkosť zásobníka zoznamu:
Information InfoView Informácie
Max. clipping planes: Capabilities Max. orezávacích rovín:
@@ -6,9 +6,9 @@ Max. texture units: Capabilities Max.
textúrových jednotiek:
Renderer name: InfoView Názov vykresľovača:
Vendor name: InfoView Dodávateľ:
Attributes stack size: Capabilities Veľkosť zásobníka atribútov:
-OpenGL version: InfoView Verzia OpenGL:
+GL version: InfoView Verzia GL:
Name stack size: Capabilities Veľkosť zásobníka názvov:
-OpenGL System name OpenGL
+3D Rendering System name 3D Rendering
Auxiliary buffer(s): Capabilities Pomocné buffre:
Max. recommended vertex elements: Capabilities Max.
odporúčaných prvkov vrcholov:
GLU version: InfoView Verzia GLU:
diff --git a/data/catalogs/preferences/opengl/sv.catkeys
b/data/catalogs/preferences/3drendering/sv.catkeys
similarity index 91%
rename from data/catalogs/preferences/opengl/sv.catkeys
rename to data/catalogs/preferences/3drendering/sv.catkeys
index 70e8e1b..94a998e 100644
--- a/data/catalogs/preferences/opengl/sv.catkeys
+++ b/data/catalogs/preferences/3drendering/sv.catkeys
@@ -1,4 +1,4 @@
-1 swedish x-vnd.Haiku-OpenGL 209187778
+1 swedish x-vnd.Haiku-3DRendering 209187778
Attributes stack size: Capabilities Attributstackstorlek:
Auxiliary buffer(s): Capabilities Hjälpbuffrar:
Available Extensions Tillgängligt
@@ -19,8 +19,8 @@ Max. recommended vertex elements: Capabilities
Max. recommenderade vertexelemen
Max. texture units: Capabilities Max. texturenheter:
Model stack size: Capabilities Modellstackstorlek:
Name stack size: Capabilities Namnstackstorlek:
-OpenGL System name OpenGL
-OpenGL version: InfoView OpenGL version:
+3D Rendering System name 3D Rendering
+GL version: InfoView GL version:
Projection stack size: Capabilities Projetionsstackstorlek:
Renderer name: InfoView Renderarnamn:
Texture stack size: Capabilities Texturstackstorlek:
diff --git a/data/catalogs/preferences/opengl/uk.catkeys
b/data/catalogs/preferences/3drendering/uk.catkeys
similarity index 93%
rename from data/catalogs/preferences/opengl/uk.catkeys
rename to data/catalogs/preferences/3drendering/uk.catkeys
index b262b14..599910f 100644
--- a/data/catalogs/preferences/opengl/uk.catkeys
+++ b/data/catalogs/preferences/3drendering/uk.catkeys
@@ -1,4 +1,4 @@
-1 ukrainian x-vnd.Haiku-OpenGL 209187778
+1 ukrainian x-vnd.Haiku-3DRendering 209187778
List stack size: Capabilities Розмір стека списку:
Information InfoView Інформація
Max. clipping planes: Capabilities Максимальна кількість площин
відсікання:
@@ -6,9 +6,9 @@ Max. texture units: Capabilities Максимальна
кількість те
Renderer name: InfoView Назва рендера:
Vendor name: InfoView Ім'я постачальника:
Attributes stack size: Capabilities Розмір стека атрибутів:
-OpenGL version: InfoView Версія OpenGL:
+GL version: InfoView Версія GL:
Name stack size: Capabilities Розмір імені стека:
-OpenGL System name OpenGL
+3D Rendering System name 3D Rendering
Auxiliary buffer(s): Capabilities Допоміжний буфер(и):
Max. recommended vertex elements: Capabilities Максимално
рекомендована кількість вершин:
GLU version: InfoView Версія GLU:
diff --git a/data/catalogs/preferences/opengl/zh-Hans.catkeys
b/data/catalogs/preferences/3drendering/zh-Hans.catkeys
similarity index 91%
rename from data/catalogs/preferences/opengl/zh-Hans.catkeys
rename to data/catalogs/preferences/3drendering/zh-Hans.catkeys
index 8e1a506..39a4308 100644
--- a/data/catalogs/preferences/opengl/zh-Hans.catkeys
+++ b/data/catalogs/preferences/3drendering/zh-Hans.catkeys
@@ -1,4 +1,4 @@
-1 english x-vnd.Haiku-OpenGL 209187778
+1 english x-vnd.Haiku-3DRendering 209187778
List stack size: Capabilities 列出堆栈大小：
Information InfoView 信息
Max. clipping planes: Capabilities 最大片段片面
@@ -6,9 +6,9 @@ Max. texture units: Capabilities 最大文字单位
Renderer name: InfoView 渲染器名称：
Vendor name: InfoView 设备供应商：
Attributes stack size: Capabilities 属性堆栈大小：
-OpenGL version: InfoView OpenGL 版本：
+GL version: InfoView GL 版本：
Name stack size: Capabilities 名称堆栈大小：
-OpenGL System name OpenGL
+3D Rendering System name 3D Rendering
Auxiliary buffer(s): Capabilities 辅助指令缓冲器：
Max. recommended vertex elements: Capabilities 最大推荐顶部单元
GLU version: InfoView GLU 版本：
diff --git a/src/preferences/opengl/OpenGL.rdef
b/src/preferences/3drendering/3DRendering.rdef
similarity index 81%
rename from src/preferences/opengl/OpenGL.rdef
rename to src/preferences/3drendering/3DRendering.rdef
index e794847..f2539b1 100644
--- a/src/preferences/opengl/OpenGL.rdef
+++ b/src/preferences/3drendering/3DRendering.rdef
@@ -1,7 +1,7 @@
-resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Haiku-OpenGL";
+resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Haiku-3DRendering";
-resource app_name_catalog_entry "x-vnd.Haiku-OpenGL:System name:OpenGL";
+resource app_name_catalog_entry "x-vnd.Haiku-3DRendering:System name:3D
Rendering";
resource app_flags B_SINGLE_LAUNCH;
@@ -13,8 +13,8 @@ resource app_version {
variety = B_APPV_DEVELOPMENT,
internal = 0,
- short_info = "OpenGL",
- long_info = "OpenGL ©2009-2010 Haiku"
+ short_info = "3D Rendering",
+ long_info = "3D Rendering ©2009-2012 Haiku, Inc."
};
resource(1, "logo.png") #'PNG ' import "logo.png";
diff --git a/src/preferences/opengl/CapabilitiesView.cpp
b/src/preferences/3drendering/CapabilitiesView.cpp
similarity index 100%
rename from src/preferences/opengl/CapabilitiesView.cpp
rename to src/preferences/3drendering/CapabilitiesView.cpp
diff --git a/src/preferences/opengl/CapabilitiesView.h
b/src/preferences/3drendering/CapabilitiesView.h
similarity index 100%
rename from src/preferences/opengl/CapabilitiesView.h
rename to src/preferences/3drendering/CapabilitiesView.h
diff --git a/src/preferences/opengl/ExtensionsList.cpp
b/src/preferences/3drendering/ExtensionsList.cpp
similarity index 100%
rename from src/preferences/opengl/ExtensionsList.cpp
rename to src/preferences/3drendering/ExtensionsList.cpp
diff --git a/src/preferences/opengl/ExtensionsList.h
b/src/preferences/3drendering/ExtensionsList.h
similarity index 100%
rename from src/preferences/opengl/ExtensionsList.h
rename to src/preferences/3drendering/ExtensionsList.h
diff --git a/src/preferences/opengl/ExtensionsView.cpp
b/src/preferences/3drendering/ExtensionsView.cpp
similarity index 100%
rename from src/preferences/opengl/ExtensionsView.cpp
rename to src/preferences/3drendering/ExtensionsView.cpp
diff --git a/src/preferences/opengl/ExtensionsView.h
b/src/preferences/3drendering/ExtensionsView.h
similarity index 100%
rename from src/preferences/opengl/ExtensionsView.h
rename to src/preferences/3drendering/ExtensionsView.h
diff --git a/src/preferences/opengl/InfoView.cpp
b/src/preferences/3drendering/InfoView.cpp
similarity index 97%
rename from src/preferences/opengl/InfoView.cpp
rename to src/preferences/3drendering/InfoView.cpp
index f1f05c0..e70ab5f 100644
--- a/src/preferences/opengl/InfoView.cpp
+++ b/src/preferences/3drendering/InfoView.cpp
@@ -33,7 +33,7 @@ InfoView::InfoView()
:
BGridView(B_TRANSLATE("Information"))
{
- _AddString(B_TRANSLATE("OpenGL version:"),
+ _AddString(B_TRANSLATE("GL version:"),
(const char*)glGetString(GL_VERSION));
_AddString(B_TRANSLATE("Vendor name:"),
(const char*)glGetString(GL_VENDOR));
diff --git a/src/preferences/opengl/InfoView.h
b/src/preferences/3drendering/InfoView.h
similarity index 100%
rename from src/preferences/opengl/InfoView.h
rename to src/preferences/3drendering/InfoView.h
diff --git a/src/preferences/opengl/Jamfile
b/src/preferences/3drendering/Jamfile
similarity index 76%
rename from src/preferences/opengl/Jamfile
rename to src/preferences/3drendering/Jamfile
index 0bd2fc4..17f219c 100644
--- a/src/preferences/opengl/Jamfile
+++ b/src/preferences/3drendering/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src preferences opengl ;
+SubDir HAIKU_TOP src preferences 3drendering ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
# For GCC2
@@ -9,7 +9,7 @@ if $(HAIKU_GCC_VERSION[1]) < 3 {
UsePrivateHeaders interface ;
-Preference OpenGL :
+Preference 3DRendering :
OpenGLApp.cpp
OpenGLWindow.cpp
OpenGLView.cpp
@@ -20,11 +20,11 @@ Preference OpenGL :
LogoView.cpp
: be GL translation libcolumnlistview.a $(HAIKU_LOCALE_LIBS)
$(TARGET_LIBSUPC++)
- : OpenGL.rdef
+ : 3DRendering.rdef
;
-DoCatalogs OpenGL :
- x-vnd.Haiku-OpenGL
+DoCatalogs 3DRendering :
+ x-vnd.Haiku-3DRendering
:
CapabilitiesView.cpp
ExtensionsList.cpp
diff --git a/src/preferences/opengl/LogoView.cpp
b/src/preferences/3drendering/LogoView.cpp
similarity index 100%
rename from src/preferences/opengl/LogoView.cpp
rename to src/preferences/3drendering/LogoView.cpp
diff --git a/src/preferences/opengl/LogoView.h
b/src/preferences/3drendering/LogoView.h
similarity index 100%
rename from src/preferences/opengl/LogoView.h
rename to src/preferences/3drendering/LogoView.h
diff --git a/src/preferences/opengl/OpenGLApp.cpp
b/src/preferences/3drendering/OpenGLApp.cpp
similarity index 89%
rename from src/preferences/opengl/OpenGLApp.cpp
rename to src/preferences/3drendering/OpenGLApp.cpp
index 1e894cb..0d30597 100644
--- a/src/preferences/opengl/OpenGLApp.cpp
+++ b/src/preferences/3drendering/OpenGLApp.cpp
@@ -13,7 +13,7 @@
OpenGLApp::OpenGLApp()
- : BApplication("application/x-vnd.Haiku-OpenGL")
+ : BApplication("application/x-vnd.Haiku-3DRendering")
{
}
diff --git a/src/preferences/opengl/OpenGLApp.h
b/src/preferences/3drendering/OpenGLApp.h
similarity index 100%
rename from src/preferences/opengl/OpenGLApp.h
rename to src/preferences/3drendering/OpenGLApp.h
diff --git a/src/preferences/opengl/OpenGLView.cpp
b/src/preferences/3drendering/OpenGLView.cpp
similarity index 100%
rename from src/preferences/opengl/OpenGLView.cpp
rename to src/preferences/3drendering/OpenGLView.cpp
diff --git a/src/preferences/opengl/OpenGLView.h
b/src/preferences/3drendering/OpenGLView.h
similarity index 100%
rename from src/preferences/opengl/OpenGLView.h
rename to src/preferences/3drendering/OpenGLView.h
diff --git a/src/preferences/opengl/OpenGLWindow.cpp
b/src/preferences/3drendering/OpenGLWindow.cpp
similarity index 91%
rename from src/preferences/opengl/OpenGLWindow.cpp
rename to src/preferences/3drendering/OpenGLWindow.cpp
index a63ad05..a637c37 100644
--- a/src/preferences/opengl/OpenGLWindow.cpp
+++ b/src/preferences/3drendering/OpenGLWindow.cpp
@@ -16,7 +16,7 @@
OpenGLWindow::OpenGLWindow()
:
- BWindow(BRect(50, 50, 450, 400), B_TRANSLATE_SYSTEM_NAME("OpenGL"),
+ BWindow(BRect(50, 50, 450, 400), B_TRANSLATE_SYSTEM_NAME("3D
Rendering"),
B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS
| B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
{
diff --git a/src/preferences/opengl/OpenGLWindow.h
b/src/preferences/3drendering/OpenGLWindow.h
similarity index 100%
rename from src/preferences/opengl/OpenGLWindow.h
rename to src/preferences/3drendering/OpenGLWindow.h
diff --git a/src/preferences/3drendering/logo.png
b/src/preferences/3drendering/logo.png
new file mode 100644
index 0000000..6f86548
Binary files /dev/null and b/src/preferences/3drendering/logo.png differ
diff --git a/src/preferences/Jamfile b/src/preferences/Jamfile
index bf8477c..f346574 100644
--- a/src/preferences/Jamfile
+++ b/src/preferences/Jamfile
@@ -18,7 +18,7 @@ SubInclude HAIKU_TOP src preferences media ;
SubInclude HAIKU_TOP src preferences mouse ;
SubInclude HAIKU_TOP src preferences network ;
SubInclude HAIKU_TOP src preferences notifications ;
-SubInclude HAIKU_TOP src preferences opengl ;
+SubInclude HAIKU_TOP src preferences 3drendering ;
SubInclude HAIKU_TOP src preferences printers ;
SubInclude HAIKU_TOP src preferences screen ;
SubInclude HAIKU_TOP src preferences screensaver ;
diff --git a/src/preferences/opengl/logo.png b/src/preferences/opengl/logo.png
deleted file mode 100644
index eb38587..0000000
Binary files a/src/preferences/opengl/logo.png and /dev/null differ
Other related posts:
