From 64629da6393c9602297042f118f9d0c110e60a12 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 2 Feb 2012 17:04:11 +0000 Subject: [PATCH] 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) --- build/jam/HaikuImage | 2 +- .../{opengl => 3drendering}/be.catkeys | 6 +++--- .../{opengl => 3drendering}/cs.catkeys | 4 ++-- .../{opengl => 3drendering}/de.catkeys | 6 +++--- .../{opengl => 3drendering}/el.catkeys | 6 +++--- .../{opengl => 3drendering}/eo.catkeys | 2 +- .../{opengl => 3drendering}/es.catkeys | 2 +- .../{opengl => 3drendering}/fi.catkeys | 6 +++--- .../{opengl => 3drendering}/fr.catkeys | 6 +++--- .../{opengl => 3drendering}/hr.catkeys | 6 +++--- .../{opengl => 3drendering}/hu.catkeys | 6 +++--- .../{opengl => 3drendering}/it.catkeys | 4 ++-- .../{opengl => 3drendering}/ja.catkeys | 6 +++--- .../{opengl => 3drendering}/ko.catkeys | 2 +- .../{opengl => 3drendering}/lt.catkeys | 6 +++--- .../{opengl => 3drendering}/nb.catkeys | 4 ++-- .../{opengl => 3drendering}/nl.catkeys | 6 +++--- .../{opengl => 3drendering}/pl.catkeys | 4 ++-- .../{opengl => 3drendering}/pt.catkeys | 4 ++-- .../{opengl => 3drendering}/pt_br.catkeys | 2 +- .../{opengl => 3drendering}/ro.catkeys | 6 +++--- .../{opengl => 3drendering}/ru.catkeys | 6 +++--- .../{opengl => 3drendering}/sk.catkeys | 6 +++--- .../{opengl => 3drendering}/sv.catkeys | 6 +++--- .../{opengl => 3drendering}/uk.catkeys | 6 +++--- .../{opengl => 3drendering}/zh-Hans.catkeys | 6 +++--- .../3DRendering.rdef} | 8 ++++---- .../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 +- .../{opengl => 3drendering}/InfoView.h | 0 src/preferences/{opengl => 3drendering}/Jamfile | 10 +++++----- .../{opengl => 3drendering}/LogoView.cpp | 0 .../{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 47 files changed, 76 insertions(+), 76 deletions(-) rename data/catalogs/preferences/{opengl => 3drendering}/be.catkeys (93%) rename data/catalogs/preferences/{opengl => 3drendering}/cs.catkeys (94%) rename data/catalogs/preferences/{opengl => 3drendering}/de.catkeys (91%) rename data/catalogs/preferences/{opengl => 3drendering}/el.catkeys (93%) rename data/catalogs/preferences/{opengl => 3drendering}/eo.catkeys (96%) rename data/catalogs/preferences/{opengl => 3drendering}/es.catkeys (97%) rename data/catalogs/preferences/{opengl => 3drendering}/fi.catkeys (91%) rename data/catalogs/preferences/{opengl => 3drendering}/fr.catkeys (89%) rename data/catalogs/preferences/{opengl => 3drendering}/hr.catkeys (87%) rename data/catalogs/preferences/{opengl => 3drendering}/hu.catkeys (92%) rename data/catalogs/preferences/{opengl => 3drendering}/it.catkeys (94%) rename data/catalogs/preferences/{opengl => 3drendering}/ja.catkeys (91%) rename data/catalogs/preferences/{opengl => 3drendering}/ko.catkeys (96%) rename data/catalogs/preferences/{opengl => 3drendering}/lt.catkeys (91%) rename data/catalogs/preferences/{opengl => 3drendering}/nb.catkeys (75%) rename data/catalogs/preferences/{opengl => 3drendering}/nl.catkeys (90%) rename data/catalogs/preferences/{opengl => 3drendering}/pl.catkeys (94%) rename data/catalogs/preferences/{opengl => 3drendering}/pt.catkeys (94%) rename data/catalogs/preferences/{opengl => 3drendering}/pt_br.catkeys (89%) rename data/catalogs/preferences/{opengl => 3drendering}/ro.catkeys (92%) rename data/catalogs/preferences/{opengl => 3drendering}/ru.catkeys (93%) rename data/catalogs/preferences/{opengl => 3drendering}/sk.catkeys (92%) rename data/catalogs/preferences/{opengl => 3drendering}/sv.catkeys (91%) rename data/catalogs/preferences/{opengl => 3drendering}/uk.catkeys (93%) rename data/catalogs/preferences/{opengl => 3drendering}/zh-Hans.catkeys (91%) rename src/preferences/{opengl/OpenGL.rdef => 3drendering/3DRendering.rdef} (81%) rename src/preferences/{opengl => 3drendering}/CapabilitiesView.cpp (100%) rename src/preferences/{opengl => 3drendering}/CapabilitiesView.h (100%) rename src/preferences/{opengl => 3drendering}/ExtensionsList.cpp (100%) rename src/preferences/{opengl => 3drendering}/ExtensionsList.h (100%) rename src/preferences/{opengl => 3drendering}/ExtensionsView.cpp (100%) rename src/preferences/{opengl => 3drendering}/ExtensionsView.h (100%) rename src/preferences/{opengl => 3drendering}/InfoView.cpp (97%) rename src/preferences/{opengl => 3drendering}/InfoView.h (100%) rename src/preferences/{opengl => 3drendering}/Jamfile (76%) rename src/preferences/{opengl => 3drendering}/LogoView.cpp (100%) rename src/preferences/{opengl => 3drendering}/LogoView.h (100%) rename src/preferences/{opengl => 3drendering}/OpenGLApp.cpp (89%) rename src/preferences/{opengl => 3drendering}/OpenGLApp.h (100%) rename src/preferences/{opengl => 3drendering}/OpenGLView.cpp (100%) rename src/preferences/{opengl => 3drendering}/OpenGLView.h (100%) rename src/preferences/{opengl => 3drendering}/OpenGLWindow.cpp (91%) rename src/preferences/{opengl => 3drendering}/OpenGLWindow.h (100%) create mode 100644 src/preferences/3drendering/logo.png delete mode 100644 src/preferences/opengl/logo.png diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 0c6929ae01..d0f8c09353 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 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 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 6bbbff29b0..f40cb261dd 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 097e924ff2..b514464b07 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 adb8abb35e..22be027743 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 d8d2abeccb..4c03d5fee4 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 83ca7478a9..195c313e2a 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 a32e8e57da..cad5c33776 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 89fc06fc13..c6130fa67a 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 9e18938f3e..e5e454974d 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 1b4d8b58d9..16ca0d2a34 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 1fa0f5afc7..4a3f4dea4d 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 4bdc69df36..5dfb48435c 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 ab2fd0bfad..3209676174 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 702da5a914..ee600a43ef 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 1e79232336..42e5a6b1ec 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 7816963a97..f19871c681 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 2b493181c2..85a41f0307 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 03402bd125..b6a1e77baa 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 748435010f..c727d54bdf 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 79d8b8401a..aaf4cdd2d8 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 abcd9f127c..2e12925fb3 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 a4049a0f12..b0a8166374 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 63de3e1e88..474ccc899e 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 70e8e1bc14..94a998e09f 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 b262b14841..599910f452 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 8e1a50602b..39a4308876 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 e794847eed..f2539b1103 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 f1f05c0496..e70ab5fa10 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 0bd2fc492d..17f219cce5 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 1e894cbd6c..0d30597144 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 a63ad0558a..a637c37d89 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 0000000000000000000000000000000000000000..6f865484afcae0f7a4f21b6e5fff5eddd79ae109 GIT binary patch literal 14773 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