From fcacf025828a879b2f51aa542c136d05be7ce424 Mon Sep 17 00:00:00 2001 From: Cinders Date: Wed, 10 Jul 2013 08:40:00 -0600 Subject: [PATCH] More merge fixing --- indra/llcommon/CMakeLists.txt | 15 +- indra/newview/CMakeLists.txt | 2 +- indra/newview/Firestorm.nib/classes.nib | 12 +- indra/newview/Firestorm.nib/info.nib | 15 +- indra/newview/Firestorm.nib/objects.xib | 440 +++++++++--------- indra/newview/Info-Firestorm.plist.in | 67 --- indra/newview/llappviewer.cpp | 5 +- .../updater/scripts/darwin/update_install.py | 6 +- 8 files changed, 250 insertions(+), 312 deletions(-) delete mode 100644 indra/newview/Info-Firestorm.plist.in diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index bf35ca3eb8..b3e72bd0b2 100755 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -292,6 +292,13 @@ list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES}) if(LLCOMMON_LINK_SHARED) add_library (llcommon SHARED ${llcommon_SOURCE_FILES}) + if(NOT WORD_SIZE EQUAL 32) + if(WINDOWS) + add_definitions(/FIXED:NO) + else(WINDOWS) # not windows therefore gcc LINUX and DARWIN + add_definitions(-fPIC) + endif(WINDOWS) + endif(NOT WORD_SIZE EQUAL 32) if(WINDOWS) # always generate llcommon.pdb, even for "Release" builds set_target_properties(llcommon PROPERTIES LINK_FLAGS "/DEBUG") @@ -301,14 +308,6 @@ else(LLCOMMON_LINK_SHARED) add_library (llcommon ${llcommon_SOURCE_FILES}) endif(LLCOMMON_LINK_SHARED) -if(NOT WORD_SIZE EQUAL 32) - if(WINDOWS) - add_definitions(/FIXED:NO) - else(WINDOWS) # not windows therefore gcc LINUX and DARWIN - add_definitions(-fPIC) - endif(WINDOWS) -endif(NOT WORD_SIZE EQUAL 32) - target_link_libraries( llcommon ${BREAKPAD_EXCEPTION_HANDLER_LIBRARIES} diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 92e2c59a5e..e459f076b9 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2252,7 +2252,7 @@ if (DARWIN) OUTPUT_NAME "${product}" MACOSX_BUNDLE_INFO_STRING "Second Life Viewer" MACOSX_BUNDLE_ICON_FILE "phoenix_icon.icns" - MACOSX_BUNDLE_GUI_IDENTIFIER "com.firestorm.indra.viewer" # F_EX merge check this + MACOSX_BUNDLE_GUI_IDENTIFIER "com.firestorm.indra.viewer" # MACOSX_BUNDLE_LONG_VERSION_STRING "${VIEWER_CHANNEL} ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}" MACOSX_BUNDLE_BUNDLE_NAME "Firestorm" MACOSX_BUNDLE_SHORT_VERSION_STRING "${VIEWER_SHORT_VERSION}" diff --git a/indra/newview/Firestorm.nib/classes.nib b/indra/newview/Firestorm.nib/classes.nib index c4b887e72b..ea58db1189 100644 --- a/indra/newview/Firestorm.nib/classes.nib +++ b/indra/newview/Firestorm.nib/classes.nib @@ -1,8 +1,4 @@ - - - - - IBVersion - 1 - - +{ +IBClasses = (); +IBVersion = 1; +} diff --git a/indra/newview/Firestorm.nib/info.nib b/indra/newview/Firestorm.nib/info.nib index 1ae2e84963..1b531de104 100644 --- a/indra/newview/Firestorm.nib/info.nib +++ b/indra/newview/Firestorm.nib/info.nib @@ -1,17 +1,22 @@ - + + IBDocumentLocation + 85 13 356 240 0 0 1280 1002 + IBEditorPositions + + 29 + 27 314 247 44 0 0 1280 1002 + IBFramework Version - 851 - IBOldestOS - 6 + 362.0 IBOpenObjects 191 IBSystem Version - 10J869 + 7D24 targetFramework IBCarbonFramework diff --git a/indra/newview/Firestorm.nib/objects.xib b/indra/newview/Firestorm.nib/objects.xib index 6bd65b9ea0..be9f4a2270 100644 --- a/indra/newview/Firestorm.nib/objects.xib +++ b/indra/newview/Firestorm.nib/objects.xib @@ -1,135 +1,203 @@ + IBCarbonFramework + NSApplication - - _NSAppleMenu + Firestorm - - - About Firestorm - TRUE - TRUE - 0 - abou + + + Firestorm + + Firestorm + + + TRUE + TRUE + About Firestorm + 0 + abou + + + _NSAppleMenu + + + + File + + File + + + + Edit + + Edit + + + TRUE + Undo + z + undo + + + TRUE + Redo + Z + redo + + + TRUE + + + TRUE + Cut + x + cut + + + TRUE + Copy + c + copy + + + TRUE + Paste + v + past + + + TRUE + Delete + clea + + + TRUE + Select All + a + sall + + + TRUE + + + TRUE + Special Characters… + chrp + + + + + + Window + + Window + + + TRUE + TRUE + Minimize Window + m + mini + + + TRUE + TRUE + Minimize All Windows + m + 1572864 + mina + + + TRUE + Zoom + zoom + + + TRUE + + + TRUE + TRUE + Bring All to Front + bfrt + + + TRUE + TRUE + Arrange in Front + 1572864 + frnt + + + _NSWindowsMenu + + + + _NSMainMenu + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 0 482 694 + 0 0 694 482 + + + 442 604 462 674 + 604 442 70 20 + OK + ok + + 2 + 2 + + 1 + + + 20 20 422 674 + 20 20 654 402 + + + 20 20 422 659 + 0 0 639 402 + text + 5 + TRUE + + + FALSE - - Window - - _NSWindowsMenu - Window - - - Minimize Window - m - TRUE - TRUE - mini - - - Minimize All Windows - m - TRUE - TRUE - 1572864 - mina - - - Zoom - TRUE - zoom - - - TRUE - - - Bring All to Front - TRUE - TRUE - bfrt - - - Arrange in Front - TRUE - TRUE - 1572864 - frnt - - - - - - Copy - c - TRUE - copy - - - Edit - - Edit - - - Undo - z - TRUE - undo - - - Redo - Z - TRUE - redo - - - TRUE - - - Cut - x - TRUE - cut - - - - Paste - v - TRUE - past - - - Delete - TRUE - clea - - - Select All - a - TRUE - sall - - - TRUE - - - Special Characters… - TRUE - chrp - - - - - - text - 5 - TRUE - 0 0 639 402 - 20 20 422 659 - + 84 72 566 766 + Release Notes + FALSE FALSE FALSE @@ -138,122 +206,54 @@ FALSE TRUE TRUE - FALSE 4 1 - Release Notes - - 0 0 694 482 - - - ok - - 2 - 2 - - 1 - OK - 604 442 70 20 - 442 604 462 674 - - - FALSE - 20 20 654 402 - - - - 20 20 422 674 - - - 0 0 482 694 - - 84 72 566 766 - 0 0 768 1024 + FALSE - - - + - - Firestorm - - - - - - - - - - - _NSMainMenu - SecondLife - - - - File - - File - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - File's Owner + Files Owner MenuBar Release Notes - IBCarbonFramework - 203 + 202 diff --git a/indra/newview/Info-Firestorm.plist.in b/indra/newview/Info-Firestorm.plist.in deleted file mode 100644 index c9c9fa648f..0000000000 --- a/indra/newview/Info-Firestorm.plist.in +++ /dev/null @@ -1,67 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - Firestorm - CFBundleIconFile - phoenix_icon.icns - CFBundleIdentifier - com.secondlife.indra.viewer - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Firestorm - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleDocumentTypes - - - CFBundleTypeExtensions - - slurl - - CFBundleTypeIconFile - seconlife - CFBundleTypeMIMETypes - - application/x-grid-location-info - - CFBundleTypeName - Secondlife SLURL - CFBundleTypeOSTypes - - SLRL - - CFBundleTypeRole - Viewer - LSTypeIsPackage - - NSDocumentClass - SecondLifeSLURL - - - CFBundleURLTypes - - - CFBundleURLName - Second Life URL - CFBundleURLSchemes - - secondlife - x-grid-location-info - - LSIsAppleDefaultForScheme - - - - CFBundleVersion - 2.6.1.18388 - CSResourcesFileMapped - - - diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 40bbf15f49..628932972f 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -276,7 +276,10 @@ static LLAppViewerListener sAppViewerListener(LLAppViewer::instance); // viewer.cpp - these are only used in viewer, should be easily moved. #if LL_DARWIN -const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.indra.viewer"; +// +//const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.indra.viewer"; +const char * const LL_VERSION_BUNDLE_ID = "com.phoenixviewer.firestorm.viewer"; +// extern void init_apple_menu(const char* product); #endif // LL_DARWIN diff --git a/indra/viewer_components/updater/scripts/darwin/update_install.py b/indra/viewer_components/updater/scripts/darwin/update_install.py index 2fc6fcdb29..2478da4c11 100755 --- a/indra/viewer_components/updater/scripts/darwin/update_install.py +++ b/indra/viewer_components/updater/scripts/darwin/update_install.py @@ -29,9 +29,11 @@ from janitor import Janitor from messageframe import MessageFrame import Tkinter, tkMessageBox -TITLE = "Second Life Viewer Updater" +#TITLE = "Second Life Viewer Updater" +TITLE = "Firestorm Viewer Updater" # Magic bundle identifier used by all Second Life viewer bundles -BUNDLE_IDENTIFIER = "com.secondlife.indra.viewer" +#BUNDLE_IDENTIFIER = "com.secondlife.indra.viewer" +BUNDLE_IDENTIFIER = "com.firestorm.indra.viewer" # Global handle to the MessageFrame so we can update message FRAME = None