Rename 3D Rendering to GL Info and move it.

* Rename 3D Rendering to GL Info
* Moved it in the source tree from src/preferences/3drendering/
  to src/tests/kits/opengl/glinfo/
* Moved in HaikuImage from SYSTEM_PREFERENCES to SYSTEM_APPS
* Does not show up in DESKBAR_APPLICATIONS like AboutSystem
  but can be found in the resulting image in /boot/system/apps/
This commit is contained in:
John Scipione 2012-04-13 23:27:40 -04:00
parent cf88fe0b31
commit 70c5197318
20 changed files with 19 additions and 18 deletions

View File

@ -69,14 +69,14 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bfsinfo
SYSTEM_APPS = AboutSystem ActivityMonitor $(X86_ONLY)BootManager CharacterMap
CodyCam DeskCalc Devices DiskProbe DiskUsage DriveSetup CDPlayer Expander
Icon-O-Matic Installer LaunchBox Magnify Mail MediaConverter MediaPlayer
MidiPlayer NetworkStatus PackageInstaller People PoorMan PowerStatus
ProcessController Screenshot ShowImage SoundRecorder StyledEdit Terminal
TextSearch TV WebWatch Workspaces
$(X86_ONLY)GLInfo Icon-O-Matic Installer LaunchBox Magnify Mail
MediaConverter MediaPlayer MidiPlayer NetworkStatus PackageInstaller People
PoorMan PowerStatus ProcessController Screenshot ShowImage SoundRecorder
StyledEdit Terminal TextSearch TV WebWatch Workspaces
;
SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations
<preference>Deskbar E-mail FileTypes Keyboard Keymap Locale Media
Mouse Network Notifications $(X86_ONLY)3DRendering Printers Screen ScreenSaver
Mouse Network Notifications Printers Screen ScreenSaver
Shortcuts Sounds Time Touchpad <preference>Tracker VirtualMemory
;
SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo $(X86_ONLY)GLTeapot

View File

@ -18,7 +18,6 @@ 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 3drendering ;
SubInclude HAIKU_TOP src preferences printers ;
SubInclude HAIKU_TOP src preferences screen ;
SubInclude HAIKU_TOP src preferences screensaver ;

View File

@ -2,6 +2,7 @@ SubDir HAIKU_TOP src tests kits opengl ;
SubInclude HAIKU_TOP src tests kits opengl direct_mode ;
SubInclude HAIKU_TOP src tests kits opengl demos ;
SubInclude HAIKU_TOP src tests kits opengl glinfo ;
SubInclude HAIKU_TOP src tests kits opengl glut ;
SubInclude HAIKU_TOP src tests kits opengl glsl ;

View File

@ -1,22 +1,22 @@
resource app_signature "application/x-vnd.Haiku-3DRendering";
resource app_signature "application/x-vnd.Haiku-GLInfo";
resource app_name_catalog_entry "x-vnd.Haiku-3DRendering:System name:3D Rendering";
resource app_name_catalog_entry "x-vnd.Haiku-GLInfo:System name:GL Info";
resource(1, "gears_64.png") #'PNG ' import "gears_64.png";
resource app_flags B_SINGLE_LAUNCH;
resource app_version {
major = 1,
major = 2,
middle = 0,
minor = 0,
variety = B_APPV_DEVELOPMENT,
internal = 0,
short_info = "3D Rendering",
long_info = "3D Rendering ©2009-2012 Haiku, Inc."
short_info = "GL Info",
long_info = "GL Info ©2009-2012 Haiku, Inc."
};
resource vector_icon {

View File

@ -1,4 +1,5 @@
SubDir HAIKU_TOP src preferences 3drendering ;
SubDir HAIKU_TOP src tests kits opengl glinfo ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
# For GCC2
@ -23,15 +24,15 @@ Includes [ FGristFiles $(sources) ] : $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
# Dependency needed to trigger downloading/unzipping the package before
# compiling the files.
Preference 3DRendering
Preference GLInfo
: $(sources)
: be GL translation libcolumnlistview.a $(HAIKU_LOCALE_LIBS)
$(TARGET_LIBSUPC++)
: 3DRendering.rdef
: GLInfo.rdef
;
DoCatalogs 3DRendering :
x-vnd.Haiku-3DRendering
DoCatalogs GLInfo :
x-vnd.Haiku-GLInfo
:
CapabilitiesView.cpp
ExtensionsView.cpp

View File

@ -16,7 +16,7 @@
OpenGLApp::OpenGLApp()
:
BApplication("application/x-vnd.Haiku-3DRendering")
BApplication("application/x-vnd.Haiku-GLInfo")
{
}

View File

@ -24,7 +24,7 @@
OpenGLWindow::OpenGLWindow()
:
BWindow(BRect(50, 50, 300, 300),
B_TRANSLATE_SYSTEM_NAME("3D Rendering"), B_TITLED_WINDOW,
B_TRANSLATE_SYSTEM_NAME("GL Info"), B_TITLED_WINDOW,
B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
| B_AUTO_UPDATE_SIZE_LIMITS)
{

View File

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB