From 88c0001344f604e5d72dbd5aaa071cb249c6798f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Tue, 7 Jun 2005 14:11:42 +0000
Subject: [PATCH] clean up (now uses our libs, haiku name)

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12988 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/magnify/Jamfile      |  7 ++++---
 src/apps/magnify/Magnify.rdef | 35 ++++++++---------------------------
 src/apps/magnify/main.cpp     |  8 ++++----
 3 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/src/apps/magnify/Jamfile b/src/apps/magnify/Jamfile
index 03fd01bea7..af51b133f1 100644
--- a/src/apps/magnify/Jamfile
+++ b/src/apps/magnify/Jamfile
@@ -1,5 +1,6 @@
 SubDir OBOS_TOP src apps magnify ;
 
-AddResources Magnify : Magnify.rdef ;
-App Magnify : main.cpp ;
-LinkSharedOSLibs Magnify : be tracker game ;
+App Magnify : 
+	main.cpp 
+	: libbe.so libtracker.so libgame.so 
+	: Magnify.rdef ;
diff --git a/src/apps/magnify/Magnify.rdef b/src/apps/magnify/Magnify.rdef
index c56ef00229..e78ae86439 100644
--- a/src/apps/magnify/Magnify.rdef
+++ b/src/apps/magnify/Magnify.rdef
@@ -1,5 +1,5 @@
 
-resource(101, "BEOS:L:STD_ICON") #'ICON' array
+resource large_icon
 {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FF"
@@ -35,7 +35,7 @@ resource(101, "BEOS:L:STD_ICON") #'ICON' array
 	$"FFFFFFFFFFFFFFFFFF0000000000000000000E0F0FFFFFFFFFFFFFFFFFFFFFFF"
 };
 
-resource(101, "BEOS:M:STD_ICON") #'MICN' array
+resource mini_icon
 {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFF000000"
 	$"FFFFFFFFFFFFFFFFFFFFFFFF000E0000"
@@ -55,32 +55,13 @@ resource(101, "BEOS:M:STD_ICON") #'MICN' array
 	$"FFFFFFFF0000000000000E0FFFFFFFFF"
 };
 
-resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.OBOS.Magnify";
+resource app_signature "application/x-vnd.Haiku.Magnify";
 
-resource(1, "BEOS:APP_VERSION") #'APPV' array
+resource app_version
 {
-	$"01000000000000000000000005000000000000004D61676E6966790000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"00000000000000000000000000000000000000004D61676E6966696573207468"
-	$"65206172656120756E64657220746865206D6F7573652E000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000"
+	short_info = "Haiku-Magnify",
+	long_info  = "Haiku version of Magnify"
 };
 
-resource(1, "BEOS:APP_FLAGS") #'APPF' $"01000000";
+resource app_flags B_SINGLE_LAUNCH;
+
diff --git a/src/apps/magnify/main.cpp b/src/apps/magnify/main.cpp
index 4ae464728d..7f983f4663 100644
--- a/src/apps/magnify/main.cpp
+++ b/src/apps/magnify/main.cpp
@@ -145,7 +145,7 @@ main(long argc, char* argv[])
 //	pass in pixelCount to maintain backward compatibility of setting
 //	the pixelcount from the command line
 TApp::TApp(int32 pixelCount)
-	:BApplication("application/x-vnd.OBOS.Magnify")
+	:BApplication("application/x-vnd.Haiku.Magnify")
 {
 	TWindow* magWindow = new TWindow(pixelCount);
 	magWindow->Show();
@@ -173,7 +173,7 @@ TApp::ReadyToRun()
 void
 TApp::AboutRequested(void)
 {
-	(new BAlert("", "Magnify!\n\n(C)2002 OBOS\n(C)1999 Be Inc.\n\nNow with even more features and recompiled for OpenBeOS.", "OK"))->Go();
+	(new BAlert("", "Magnify!\n\n(C)2002-2005 Haiku\n(C)1999 Be Inc.\n\nNow with even more features and recompiled for OpenBeOS.", "OK"))->Go();
 }
 
 //******************************************************************************
@@ -185,7 +185,7 @@ TApp::AboutRequested(void)
 const int32 kBorderSize = 10;
 
 TWindow::TWindow(int32 pixelCount)
-	: BWindow( BRect(0,0,0,0), "OBOS Magnify", B_TITLED_WINDOW,
+	: BWindow( BRect(0,0,0,0), "Magnify", B_TITLED_WINDOW,
 		B_OUTLINE_RESIZE)
 {
 	GetPrefs(pixelCount);
@@ -347,7 +347,7 @@ TWindow::QuitRequested()
 //		show info	(rgb, location)
 //		pixel count
 //		pixel size
-const char* const kAppName = "OBOS Magnify";
+const char* const kAppName = "Magnify";
 const bool kDefaultShowGrid = true;
 const bool kDefaultShowInfo = true;
 const int32 kDefaultPixelCount = 32;