Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More helpful fixes and touchups from Cinder

Browse Source
This commit is contained in:
Inusaito Sayori
2014-03-27 20:10:06 -04:00
parent 2af2e37dcd
commit 70e92a1cea
12 changed files with 39 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@@ -8477,7 +8477,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<integer>1</integer>
</map>
<key>ForceMandatoryUpdate</key>
<map>

27
indra/newview/installers/windows/installer_template.nsi
View File

@@ -31,6 +31,7 @@ RequestExecutionLevel admin ; on Vista we must be admin because we write to Prog
;; !define INSTNAME "SecondLife%(grid_caps)s"
;; !define SHORTCUT "Second Life (%(grid_caps)s)"
;; !define URLNAME "secondlife%(grid)s"
;; !define AUTHOR "Linden Research, Inc."
;; !define UNINSTALL_SETTINGS 1
%%GRID_VARS%%
@@ -76,8 +77,8 @@ Name "${VIEWERNAME}"
SubCaption 0 $(LicenseSubTitleSetup) ; override "license agreement" text
BrandingText "Prepare to Implode!" ; bottom of window text
Icon %%SOURCE%%\installers\windows\install_icon_singularity.ico
UninstallIcon %%SOURCE%%\installers\windows\uninstall_icon_singularity.ico
Icon %%SOURCE%%\installers\windows\${INSTALL_ICON}
UninstallIcon %%SOURCE%%\installers\windows\${UNINSTALL_ICON}
WindowIcon off ; show our icon in left corner
# BGGradient 9090b0 000000 notext
CRCCheck on ; make sure CRC is OK
@@ -89,7 +90,7 @@ SetOverwrite on ; stomp files by default
AutoCloseWindow true ; after all files install, close window
InstallDir "%%INSTALLDIR%%"
InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""
InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\${INSTNAME}" ""
DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -191,7 +192,7 @@ FunctionEnd
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function CheckIfAlreadyCurrent
Push $0
ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version"
ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG" "Version"
StrCmp $0 ${VERSION_LONG} 0 DONE
MessageBox MB_OKCANCEL $(CheckIfCurrentMB) /SD IDOK IDOK DONE
Quit
@@ -550,7 +551,7 @@ SetShellVarContext all
Call un.CloseSecondLife
; Clean up registry keys and subkeys (these should all be !defines somewhere)
DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG"
DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG"
DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"
; Clean up shortcuts
@@ -693,7 +694,7 @@ lbl_check_silent:
; If we currently have a version of SL installed, default to the language of that install
; Otherwise don't change $LANGUAGE and it will default to the OS UI language.
ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"
ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\${INSTNAME}" "InstallerLanguage"
IfErrors lbl_build_menu
StrCpy $LANGUAGE $0
@@ -711,7 +712,7 @@ lbl_build_menu:
StrCpy $LANGUAGE $0
; save language in registry
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" $LANGUAGE
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\${INSTNAME}" "InstallerLanguage" $LANGUAGE
lbl_return:
Pop $0
Return
@@ -721,7 +722,7 @@ FunctionEnd
Function un.onInit
; read language from registry and set for uninstaller
; Key will be removed on successful uninstall
ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"
ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\${INSTNAME}" "InstallerLanguage"
IfErrors lbl_end
StrCpy $LANGUAGE $0
lbl_end:
@@ -810,11 +811,11 @@ CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Write registry
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags" "$INSTFLAGS"
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut" "$INSTSHORTCUT"
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe" "$INSTEXE"
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG" "" "$INSTDIR"
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG" "Version" "${VERSION_LONG}"
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG" "Flags" "$INSTFLAGS"
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG" "Shortcut" "$INSTSHORTCUT"
WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\${AUTHOR}\$INSTPROG" "Exe" "$INSTEXE"
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG (remove only)"
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe"'

18
indra/newview/llappviewer.cpp
View File

@@ -355,6 +355,7 @@ void init_default_trans_args()
{
default_trans_args.insert("SECOND_LIFE"); // World
default_trans_args.insert("APP_NAME");
default_trans_args.insert("SHORT_APP_NAME");
default_trans_args.insert("CAPITALIZED_APP_NAME");
default_trans_args.insert("SECOND_LIFE_GRID");
default_trans_args.insert("SUPPORT_SITE");
@@ -2363,23 +2364,6 @@ bool LLAppViewer::initConfiguration()
#if LL_DARWIN
// Initialize apple menubar and various callbacks
init_apple_menu(LLTrans::getString("APP_NAME").c_str());
#if __ppc__
// If the CPU doesn't have Altivec (i.e. it's not at least a G4), don't go any further.
// Only test PowerPC - all Intel Macs have SSE.
if(!gSysCPU.hasAltivec())
{
std::ostringstream msg;
msg << LLTrans::getString("MBRequiresAltiVec");
OSMessageBox(
msg.str(),
LLStringUtil::null,
OSMB_OK);
removeMarkerFile();
return false;
}
#endif
#endif // LL_DARWIN
// Display splash screen. Must be after above check for previous

2
indra/newview/llpanellogin.cpp
View File

@@ -647,7 +647,7 @@ void LLPanelLogin::updateLocationSelectorsVisibility()
sInstance->getChildView("location_panel")->setVisible(show_start);
bool show_server = true;
bool show_server = gSavedSettings.getBOOL("ForceShowGrid");
sInstance->getChildView("grids_panel")->setVisible(show_server);
}

0
indra/newview/res/singularity.icns → indra/newview/res/singularity_icon.icns
View File

6
indra/newview/res/viewerRes.rc.in
View File

@@ -61,8 +61,8 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_LL_ICON ICON "singularity_icon.ico"
IDI_LCD_LL_ICON ICON "singularity_icon.ico"
IDI_LL_ICON ICON "${VIEWER_BRANDING_ID}_icon.ico"
IDI_LCD_LL_ICON ICON "${VIEWER_BRANDING_ID}_icon.ico"
/////////////////////////////////////////////////////////////////////////////
//
@@ -74,7 +74,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
FONT 8, "MS Sans Serif"
BEGIN
ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20
LTEXT "Loading Second Life...",666,36,13,91,8
LTEXT "Loading ${VIEWER_CHANNEL}...",666,36,13,91,8
END

6
indra/newview/res/viewerRes_bc.rc.in
View File

@@ -61,8 +61,8 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_LL_ICON ICON "singularity_icon_bc.ico"
IDI_LCD_LL_ICON ICON "singularity_icon_bc.ico"
IDI_LL_ICON ICON "${VIEWER_BRANDING_ID}_icon_bc.ico"
IDI_LCD_LL_ICON ICON "${VIEWER_BRANDING_ID}_icon_bc.ico"
/////////////////////////////////////////////////////////////////////////////
//
@@ -74,7 +74,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
FONT 8, "MS Sans Serif"
BEGIN
ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20
LTEXT "Loading Second Life...",666,36,13,91,8
LTEXT "Loading ${VIEWER_CHANNEL}...",666,36,13,91,8
END

4
indra/newview/skins/default/xui/en-us/floater_about.xml
View File

@@ -2,7 +2,7 @@
<floater can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="false" height="440" min_height="100" min_width="100"
name="floater_about" rect_control="FloaterAboutRect"
title="About [APP_NAME]" width="470">
title="About [SHORT_APP_NAME]" width="470">
<tab_container follows="all" bottom="1" border="false" left="10" height="414" width="450" name="about_tab" tab_position="top">
<panel border="false" height="386" label="Info" help_topic="about_support_tab" name="support_panel">
<text_editor parse_urls="true" follows="top|left" font="SansSerif" top="-1" bg_readonly_color="transparent" left="3" max_length="65536" name="support_editor" bottom="28" width="443" word_wrap="true"/>
@@ -31,7 +31,7 @@ Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
expat Copyright (C) 1998-2000 Thai Open Source Software Center Ltd., 2001-2006 Expat maintainers.
FMOD Sound System, Copyright (C) 1994-2012 Firelight Technologies Pty, Ltd.
FMOD Sound System, Copyright (C) 1994-2013 Firelight Technologies Pty, Ltd.
FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
GL Copyright (C) 1999-2004 Brian Paul.
GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.

4
indra/newview/skins/default/xui/en-us/menu_login.xml
View File

@@ -21,10 +21,10 @@
<menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
height="317" label="Help" left="80" mouse_opaque="false" name="Help"
opaque="true" tear_off="false" width="166">
<menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"
<!--menu_item_call bottom="-29" enabled="true" height="19" label="[SECOND_LIFE] Help" left="0"
mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
<on_click function="ShowFloater" userdata="help f1" />
</menu_item_call>
</menu_item_call-->
<menu_item_call bottom="-48" enabled="true" height="19" label="About [APP_NAME]..." left="0"
mouse_opaque="true" name="About Second Life..." width="166">
<on_click function="ShowFloater" userdata="about" />

10
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -895,7 +895,7 @@
<menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
height="317" label="Help" left="227" mouse_opaque="false" name="Help"
opaque="true" tear_off="true" width="166">
<!--menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"
<!--menu_item_call bottom="-29" enabled="true" height="19" label="[SECOND_LIFE] Help" left="0"
mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
<on_click function="ShowFloater" userdata="help f1" />
</menu_item_call-->
@@ -944,7 +944,7 @@
<on_click function="PromptShowURL" name="PublicIssueTrackerHelp_url"
userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
</menu_item_call>
<menu_item_call bottom="-94" enabled="true" height="19" label="Singularity Issue Tracker..."
<menu_item_call bottom="-94" enabled="true" height="19" label="[SHORT_APP_NAME] Issue Tracker..."
left="0" mouse_opaque="true" name="Singularity Issue Tracker..." width="166">
<on_click function="PromptShowURL" name="SinguIssueTracker_url"
userdata="WebLaunchSinguIssue,http://links.singularityviewer.org/?to=issues" />
@@ -971,8 +971,8 @@
<on_click function="PromptShowURL" name="ReportBug_url"
userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
</menu_item_call>
<menu_item_call bottom="-240" enabled="true" height="19" label="Report Singularity Bug..." left="0"
mouse_opaque="true" name="Report Singularity Bug..." width="166">
<menu_item_call bottom="-240" enabled="true" height="19" label="Report [SHORT_APP_NAME] Bug..." left="0"
mouse_opaque="true" name="Report [SHORT_APP_NAME] Bug..." width="166">
<on_click function="PromptShowURL" name="ReportSinguBug_url"
userdata="WebLaunchSinguIssue,http://code.google.com/p/singularity-viewer/issues/entry" />
</menu_item_call>
@@ -985,7 +985,7 @@
<on_click function="ShowFloater" userdata="about" />
</menu_item_call>
</menu>
<menu create_jump_keys="true" drop_shadow="true" enabled="true" label="Singularity" mouse_opaque="false" name="Singularity" opaque="true" tear_off="true">
<menu create_jump_keys="true" drop_shadow="true" enabled="true" label="[SHORT_APP_NAME]" mouse_opaque="false" name="Singularity" opaque="true" tear_off="true">
<menu_item_call label="Close All Dialogs" mouse_opaque="true" name="Close All Dialogs" shortcut="control|alt|shift|D">
<on_click function="CloseAllDialogs"/>
</menu_item_call>

1
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -27,6 +27,7 @@ Make sure you entered the correct Login URI. An example of a Login URI is: \"htt
<string name="SECOND_LIFE">Second Life</string>
<string name="APP_NAME">Singularity Viewer</string>
<string name="CAPITALIZED_APP_NAME">SINGULARITY VIEWER</string>
<string name="SHORT_APP_NAME">Singularity</string>
<string name="SECOND_LIFE_GRID">Second Life Grid</string>
<string name="SUPPORT_SITE">Second Life Support Portal</string>

10
indra/newview/viewer_manifest.py
View File

@@ -406,6 +406,8 @@ class WindowsManifest(ViewerManifest):
'inst_name':self.channel_oneword() + ' (64 bit)' if self.is_win64() else self.channel_oneword(),
'installer_file':self.installer_file(),
'viewer_name': "%s%s" % (self.channel(), " (64 bit)" if self.is_win64() else "" ),
'install_icon': "install_icon_%s.ico" % self.viewer_branding_id(),
'uninstall_icon': "uninstall_icon_%s.ico" % self.viewer_branding_id(),
}
version_vars = """
@@ -422,8 +424,9 @@ class WindowsManifest(ViewerManifest):
!define INSTNAME "%(inst_name)s"
!define SHORTCUT "%(viewer_name)s Viewer"
!define URLNAME "secondlife"
!define INSTALL_ICON "install_icon_singularity.ico"
!define UNINSTALL_ICON "install_icon_singularity.ico"
!define INSTALL_ICON "%(install_icon)s"
!define UNINSTALL_ICON "%(uninstall_icon)s"
!define AUTHOR "Linden Research, Inc." #TODO: Hook this up to cmake et al for easier branding.
Caption "${VIEWERNAME} ${VERSION_LONG}"
"""
if 'installer_name' in self.args:
@@ -493,8 +496,7 @@ class DarwinManifest(ViewerManifest):
self.path("featuretable_mac.txt")
self.path("SecondLife.nib")
# SG:TODO
self.path("../newview/res/singularity.icns", dst="singularity.icns")
self.path(("../newview/res/%s_icon.icns" % self.viewer_branding_id()), dst=("%s_icon.icns" % self.viewer_branding_id()))
# Translations
self.path("English.lproj")