kamp
/
RetroZilla
mirror of https://github.com/rn10950/RetroZilla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cursor:none pt 1

This commit is contained in:
Ryan Nematz 2016-05-05 06:00:13 -04:00
parent 9ff0b9c0a2
commit 70a63e3fce
34 changed files with 143 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.mozconfig.mk
View File

@ -1,12 +1,12 @@
# gmake
# This file is automatically generated for client.mk.
# Do not edit. Edit /c/projects/retrozilla/mozilla/mozconfig instead.
# Do not edit. Edit /c/projects/moz95/mozilla/mozconfig instead.
# To create a new .mozconfig file, you can visit,
# http://webtools.mozilla.org/build/config.cgi
# PATH=/local/bin:/c/mozilla-build//wget:/c/mozilla-build//7zip:/c/mozilla-build//blat261/full:/c/mozilla-build//python25:/c/mozilla-build//svn-win32-1.4.2/bin:/c/mozilla-build//upx203w:/c/mozilla-build//xemacs/XEmacs-21.4.19/i586-pc-win32:/c/mozilla-build//info-zip:/c/mozilla-build//nsis-2.22:/c/mozilla-build//nsis-2.33u:.:/usr/local/bin:/mingw/bin:/bin:/c/PROGRA~1/MICROS~3/Common/msdev98/BIN:/c/PROGRA~1/MICROS~3/VC98/BIN:/c/PROGRA~1/MICROS~3/Common/TOOLS/WINNT:/c/PROGRA~1/MICROS~3/Common/TOOLS:/c/WINNT/System32:/c/WINNT:/c/WINNT/System32/Wbem:/c/mozilla-build/moztools-180compat/bin
MOZ_MAKE_FLAGS=-j4
MOZ_OBJDIR=/c/projects/retrozilla/obj-sm95-release
MOZ_OBJDIR=/c/projects/moz95/obj-sm95-release
# --target=i586-pc-msvc is used by configure (not client.mk)
# --enable-application=suite is used by configure (not client.mk)
# --enable-optimize is used by configure (not client.mk)

3
content/events/src/nsEventStateManager.cpp
View File

@ -2710,6 +2710,9 @@ nsEventStateManager::SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
case NS_STYLE_CURSOR_EW_RESIZE:
c = eCursor_ew_resize;
break;
case NS_STYLE_CURSOR_NONE:
c = eCursor_none;
break;
}
// First, try the imgIContainer, if non-null

1
layout/base/nsStyleConsts.h
View File

@ -309,6 +309,7 @@
#define NS_STYLE_CURSOR_NWSE_RESIZE 33
#define NS_STYLE_CURSOR_NS_RESIZE 34
#define NS_STYLE_CURSOR_EW_RESIZE 35
#define NS_STYLE_CURSOR_NONE 36
// See nsStyleDisplay
#define NS_STYLE_DIRECTION_LTR 0

1
layout/style/nsCSSProps.cpp
View File

@ -487,6 +487,7 @@ const PRInt32 nsCSSProps::kCursorKTable[] = {
eCSSKeyword_nwse_resize, NS_STYLE_CURSOR_NWSE_RESIZE,
eCSSKeyword_ns_resize, NS_STYLE_CURSOR_NS_RESIZE,
eCSSKeyword_ew_resize, NS_STYLE_CURSOR_EW_RESIZE,
eCSSKeyword_none, NS_STYLE_CURSOR_NONE,
// -moz- prefixed aliases for some CSS3 cursors for backward compat
eCSSKeyword__moz_copy, NS_STYLE_CURSOR_COPY,
eCSSKeyword__moz_alias, NS_STYLE_CURSOR_ALIAS,

1
widget/public/nsIWidget.h
View File

@ -204,6 +204,7 @@ enum nsCursor { ///(normal cursor, usually rendered as an arrow)
eCursor_nwse_resize,
eCursor_ns_resize,
eCursor_ew_resize,
eCursor_none,
// This one better be the last one in this list.
eCursorCount
};

4
widget/src/beos/nsWindow.cpp
View File

@ -1531,6 +1531,10 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
case eCursor_ew_resize:
newCursor = (BCursor *)gCursorArray.SafeElementAt(1);
break;
case eCursor_none:
// XXX: No suitable cursor, needs implementing
break;
default:
NS_ASSERTION(0, "Invalid cursor type");

2
widget/src/build/widget.rc
View File

@ -49,7 +49,7 @@ IDC_ZOOMIN CURSOR DISCARDABLE "res/zoom_in.cur"
IDC_ZOOMOUT CURSOR DISCARDABLE "res/zoom_out.cur"
IDC_COLRESIZE CURSOR DISCARDABLE "res/col_resize.cur"
IDC_ROWRESIZE CURSOR DISCARDABLE "res/row_resize.cur"
IDC_VERTICALTEXT CURSOR DISCARDABLE "res/vertical_text.cur"
IDC_VERTICALTEXT CURSOR DISCARDABLE "res/vertical_text.cur" IDC_NONE CURSOR DISCARDABLE "res/none.cur"
OPTPROPSHEET DIALOG DISCARDABLE 32, 32, 288, 226
STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE |

7
widget/src/cocoa/nsCursorManager.mm
View File

@ -241,6 +241,13 @@ static BOOL isPantherOrLater()
{
[[self getCursor: mCurrentCursor] unset];
[[self getCursor: aCursor] set];
if (aCursor == eCursor_none) {
[NSCursor hide];
} else if (mCurrentCursor == eCursor_none) {
[NSCursor unhide];
}
mCurrentCursor = aCursor;
}
}

33
widget/src/gtk2/nsGtkCursors.h
View File

@ -453,6 +453,33 @@ static const unsigned char moz_nwse_resize_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
/* MOZ_CURSOR_NONE */
static const unsigned char moz_none_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
static const unsigned char moz_none_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
enum {
MOZ_CURSOR_QUESTION_ARROW = 0,
MOZ_CURSOR_HAND_GRAB,
@ -468,7 +495,8 @@ enum {
MOZ_CURSOR_ROW_RESIZE,
MOZ_CURSOR_VERTICAL_TEXT,
MOZ_CURSOR_NESW_RESIZE,
MOZ_CURSOR_NWSE_RESIZE
MOZ_CURSOR_NWSE_RESIZE,
MOZ_CURSOR_NONE
};
// create custom pixmap cursor from cursors in nsGTKCursorData.h
@ -487,7 +515,8 @@ static const nsGtkCursor GtkCursors[] = {
{ moz_row_resize_bits, moz_row_resize_mask_bits, 7, 9 },
{ moz_vertical_text_bits, moz_vertical_text_mask_bits, 8, 4 },
{ moz_nesw_resize_bits, moz_nesw_resize_mask_bits, 8, 8 },
{ moz_nwse_resize_bits, moz_nwse_resize_mask_bits, 8, 8 }
{ moz_nwse_resize_bits, moz_nwse_resize_mask_bits, 8, 8 },
{ moz_none_bits, moz_none_mask_bits, 0, 0 }
};
#endif /* nsGtkCursors_h__ */

3
widget/src/gtk2/nsWindow.cpp
View File

@ -3749,6 +3749,9 @@ get_gtk_cursor(nsCursor aCursor)
case eCursor_ew_resize:
gdkcursor = gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW);
break;
case eCursor_none:
newType = MOZ_CURSOR_NONE;
break;
default:
NS_ASSERTION(aCursor, "Invalid cursor type");
gdkcursor = gdk_cursor_new(GDK_LEFT_PTR);

6
widget/src/os2/nsWindow.cpp
View File

@ -1878,7 +1878,11 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
case eCursor_ew_resize:
newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZEWE, FALSE);
break;
case eCursor_none:
newPointer = gPtrArray[IDC_NONE-IDC_BASE];
break;
default:
NS_ASSERTION(0, "Invalid cursor type");
break;

7
widget/src/os2/wdgtos2rc.h
View File

@ -48,11 +48,12 @@
#define IDC_COLRESIZE 4108
#define IDC_ROWRESIZE 4109
#define IDC_VERTICALTEXT 4110
#define IDC_NONE 4112
/* OS/2 specific */
#define IDC_ARROWWAIT 4111
#define IDC_CROSS 4112
#define IDC_HELP 4113
#define IDC_ARROWWAIT 4113
#define IDC_CROSS 4114
#define IDC_HELP 4115
#define IDC_COUNT IDC_HELP-IDC_BASE+1

1
widget/src/os2/widget.rc
View File

@ -52,6 +52,7 @@ POINTER IDC_VERTICALTEXT res\vertical_text.ptr
POINTER IDC_ARROWWAIT res\arrow_wait.ptr
POINTER IDC_CROSS res\crosshair.ptr
POINTER IDC_HELP res\help.ptr
POINTER IDC_NONE res\help.ptr
ICON IDC_DNDURL res\dndurl.ico
ICON IDC_DNDTEXT res\dndtext.ico

1
widget/src/windows/resource.h
View File

@ -46,3 +46,4 @@
#define IDC_ROWRESIZE 4109
#define IDC_VERTICALTEXT 4110
#define IDC_DUMMY_CE_MENUBAR 4111
#define IDC_NONE 4112

1
xpfe/bootstrap/splashos2.rc
View File

@ -71,6 +71,7 @@ POINTER IDC_ZOOMOUT "..\\..\\widget\\src\\os2\\res\\zoom_out.ptr"
POINTER IDC_ARROWWAIT "..\\..\\widget\\src\\os2\\res\\arrow_wait.ptr"
POINTER IDC_CROSS "..\\..\\widget\\src\\os2\\res\\crosshair.ptr"
POINTER IDC_HELP "..\\..\\widget\\src\\os2\\res\\help.ptr"
POINTER IDC_NONE "..\\..\\widget\\src\\os2\\res\\help.ptr"
ICON IDC_DNDURL "..\\..\\widget\\src\\os2\\res\\dndurl.ico"
ICON IDC_DNDTEXT "..\\..\\widget\\src\\os2\\res\\dndtext.ico"

4
xpinstall/packager/win_gre/config.ini
View File

@ -142,7 +142,7 @@ Show Dialog=TRUE
;*** LOCALIZE ME BABY ***
Title=GRE Setup - Welcome
;*** LOCALIZE ME BABY ***
Message0=Welcome to %s Setup. You are about to install %s version 1.1.0.0000000000.
Message0=Welcome to %s Setup. You are about to install %s version 2.0.0.0000000000.
;*** LOCALIZE ME BABY ***
Message1=It is strongly recommended that you exit all Windows programs before running this Setup program.
;*** LOCALIZE ME BABY ***
@ -655,7 +655,7 @@ Timing=post smartupdate
Root Key=HKEY_LOCAL_MACHINE
Key=[REGPATH]\Uninstall
Name=Description
Name Value=GRE (1.1)
Name Value=GRE (2.0)
Type=REG_SZ
Decrypt Key=TRUE
Decrypt Name=FALSE

4
xpinstall/packager/win_gre/gre.js
View File

@ -191,7 +191,7 @@ function registerMainKeys(winreg)
subkey = regRootKey + "\\Uninstall";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "Uninstall Log Folder", fProgram + "Uninstall");
err = winreg.setValueString(subkey, "Description", "GRE (1.1)");
err = winreg.setValueString(subkey, "Description", "GRE (2.0)");
}
// main
@ -210,7 +210,7 @@ var regRootKey;
regRootKey = new String(Install.arguments);
srDest = 1;
err = initInstall("GRE", "GRE", "1.1.0.0000000000");
err = initInstall("GRE", "GRE", "2.0.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");

8
xpinstall/packager/win_gre/xpcom.js
View File

@ -116,7 +116,7 @@ var fileMsvcrt;
var fileMsvcirt;
srDest = 1;
err = initInstall("Mozilla XPCOM", "XPCOM", "1.1.0.0000000000");
err = initInstall("Mozilla XPCOM", "XPCOM", "2.0.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
@ -137,7 +137,7 @@ if(verifyDiskSpace(fProgram, srDest))
upgradeCleanup();
err = addDirectory("",
"1.1.0.0000000000",
"2.0.0.0000000000",
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
@ -156,7 +156,7 @@ if(verifyDiskSpace(fProgram, srDest))
{
logComment("File not found: " + fileMsvcrt);
addFile("/Microsoft/Shared/msvcrt.dll",
"1.1.0.0000000000",
"2.0.0.0000000000",
"msvcrt.dll", // dir name in jar to extract
fWindowsSystem, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to fProgram
@ -178,7 +178,7 @@ if(verifyDiskSpace(fProgram, srDest))
{
logComment("File not found: " + fileMsvcirt);
addFile("/Microsoft/Shared/msvcirt.dll",
"1.1.0.0000000000",
"2.0.0.0000000000",
"msvcirt.dll", // dir name in jar to extract
fWindowsSystem, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to fProgram

34
xpinstall/packager/windows/browser.js
View File

@ -105,12 +105,12 @@ function registerProgramFolderKey(winreg, fFolderPath)
subkey = "SOFTWARE\\RetroZilla\\RetroZilla";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "CurrentVersion", "1.1 (en)");
err = winreg.setValueString(subkey, "CurrentVersion", "2.0 (en)");
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\1.1 (en)";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.0 (en)";
winreg.createKey(subkey,"");
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\1.1 (en)\\Main";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.0 (en)\\Main";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "Program Folder Path", fFolderPath);
}
@ -219,7 +219,7 @@ function createShortcuts()
}
logComment("folderQuickLaunchExists: " + folderQuickLaunchExists);
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\1.1 (en)\\Main";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.0 (en)\\Main";
fFolderPathStr = winreg.getValueString(subkey, "Program Folder Path");
if((fFolderPathStr == "") || (fFolderPathStr == null))
{
@ -293,7 +293,7 @@ function createShortcuts()
fileDelete(fFolderPath);
}
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\1.1 (en)\\Setup";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.0 (en)\\Setup";
regvalue = winreg.getValueString(subkey, "browserargs");
/* log this so if the user turns on turbo mode in the browser the uninstaller will undo it */
@ -366,12 +366,12 @@ function registerMainKeys(winreg)
subkey = "SOFTWARE\\RetroZilla\\RetroZilla";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "CurrentVersion", "1.1 (en)");
err = winreg.setValueString(subkey, "CurrentVersion", "2.0 (en)");
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\1.1 (en)";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.0 (en)";
winreg.createKey(subkey,"");
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\1.1 (en)\\Main";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.0 (en)\\Main";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "Install Directory", fProgram);
@ -379,20 +379,20 @@ function registerMainKeys(winreg)
// The following keys are required to be created to supply information
// about the location of the Gecko Embedded Client to 3rd party apps.
// "SOFTWARE\\Mozilla" must not be localized!
subkey = "SOFTWARE\\Mozilla\\RetroZilla 1.1";
subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.0";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "GeckoVer", "$GreVersion$");
subkey = "SOFTWARE\\Mozilla\\RetroZilla 1.1\\Extensions";
subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.0\\Extensions";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "Components", fProgram + "Components");
err = winreg.setValueString(subkey, "Plugins", fProgram + "Plugins");
subkey = "SOFTWARE\\Mozilla\\RetroZilla 1.1\\bin";
subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.0\\bin";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "PathToExe", fProgram + "RetroZilla.exe");
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\1.1 (en)\\Main";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.0 (en)\\Main";
err = winreg.setValueString(subkey, "PathToExe", fProgram + "RetroZilla.exe");
// Register as a windows XP internet browser
@ -416,7 +416,7 @@ function registerMainKeys(winreg)
data = "\"" + fProgram + "RetroZilla.exe\"";
winreg.setValueString(subkey + "\\shell\\open\\command", "", data);
data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"1.1 (en)\" /hs browser";
data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.0 (en)\" /hs browser";
winreg.setValueString(subkey + "\\InstallInfo", "HideIconsCommand", data);
winreg.setValueNumber(subkey + "\\InstallInfo", "IconsVisible", 1);
@ -424,7 +424,7 @@ function registerMainKeys(winreg)
data = "\"" + fProgram + "RetroZilla.exe\" -silent -nosplash -setDefaultBrowser ";
winreg.setValueString(subkey + "\\InstallInfo", "ReinstallCommand", data);
data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"1.1 (en)\" /ss browser";
data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.0 (en)\" /ss browser";
winreg.setValueString(subkey + "\\InstallInfo", "ShowIconsCommand", data);
}
}
@ -725,7 +725,7 @@ if(args == "-greLocal")
gGreLocal = true;
srDest = 1;
err = initInstall("RetroZilla", "Browser", "1.1.0.0000000000");
err = initInstall("RetroZilla", "Browser", "2.0.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
@ -738,7 +738,7 @@ if(verifyDiskSpace(fProgram, srDest))
upgradeCleanup();
err = addDirectory("",
"1.1.0.0000000000",
"2.0.0.0000000000",
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
@ -830,7 +830,7 @@ if(verifyDiskSpace(fProgram, srDest))
if (! ('buildID' in Install))
{
logComment("Running Pre-Mozilla 0.9.1");
initInstall("Post-install Cleanup Utility", "Browser/xpicleanup", "1.1.0.0000000000");
initInstall("Post-install Cleanup Utility", "Browser/xpicleanup", "2.0.0.0000000000");
cleanupUtility = getFolder(fProgram, "xpicleanup.exe");
err = File.execute(cleanupUtility);
logComment("execute() returned: " + err);

2
xpinstall/packager/windows/chatzilla.js
View File

@ -95,7 +95,7 @@ function getPlatform()
return platformNode;
}
var err = initInstall("Chatzilla v0.5", "Chatzilla", "1.1.0.0000000000");
var err = initInstall("Chatzilla v0.5", "Chatzilla", "2.0.0.0000000000");
logComment("initInstall: " + err);
addFile("Chatzilla service",

40
xpinstall/packager/windows/config.ini
View File

@ -10,7 +10,7 @@ Run Mode=Normal
Company Name=RetroZilla
Product Name=RetroZilla
Product NameInternal=RetroZilla
User Agent=1.1 (en)
User Agent=2.0 (en)
; Destination Path values:
; PROGRAMFILESDIR
@ -188,7 +188,7 @@ Show Dialog=TRUE
;*** LOCALIZE ME BABY ***
Title=RetroZilla Setup - Welcome
;*** LOCALIZE ME BABY ***
Message0=Welcome to %s Setup. You are about to install %s version 1.1.0.0000000000.
Message0=Welcome to %s Setup. You are about to install %s version 2.0.0.0000000000.
;*** LOCALIZE ME BABY ***
Message1=It is strongly recommended that you exit all Windows programs before running this Setup program.
;*** LOCALIZE ME BABY ***
@ -618,7 +618,7 @@ Install Size System=1
Install Size Archive=1
Attributes=SELECTED|UNCOMPRESS|SUPERSEDE|LAUNCHAPP|INVISIBLE
;*** LOCALIZE ME BABY ***
Parameter=-mmi -ms -app "RetroZilla 1.1 (en)" -app_path "[SETUP PATH]\RetroZilla.exe"
Parameter=-mmi -ms -app "RetroZilla 2.0 (en)" -app_path "[SETUP PATH]\RetroZilla.exe"
SupersedeType=GRE
SupersedeWinReg0=HKEY_LOCAL_MACHINE\Software\mozilla.org\GRE
SupersedeVersion0=0.0.0.0
@ -1025,7 +1025,7 @@ Timing=pre smartupdate
[Windows Registry2]
Root Key=HKEY_LOCAL_MACHINE
;*** LOCALIZE ME BABY ***
Key=Software\RetroZilla\RetroZilla\1.1 (en)
Key=Software\RetroZilla\RetroZilla\2.0 (en)
Name=
Name Value=
Type=REG_SZ
@ -1039,7 +1039,7 @@ Timing=pre smartupdate
[Windows Registry3]
Root Key=HKEY_LOCAL_MACHINE
;*** LOCALIZE ME BABY ***
Key=Software\RetroZilla\RetroZilla\1.1 (en)\Main
Key=Software\RetroZilla\RetroZilla\2.0 (en)\Main
Name=Program Folder Path
Name Value=[Default Folder]
Type=REG_SZ
@ -1053,9 +1053,9 @@ Timing=pre smartupdate
[Windows Registry4]
Root Key=HKEY_LOCAL_MACHINE
;*** LOCALIZE ME BABY ***
Key=Software\RetroZilla\RetroZilla\1.1 (en)\Uninstall
Key=Software\RetroZilla\RetroZilla\2.0 (en)\Uninstall
Name=Description
Name Value=RetroZilla (1.1)
Name Value=RetroZilla (2.0)
Type=REG_SZ
Decrypt Key=FALSE
Decrypt Name=FALSE
@ -1067,7 +1067,7 @@ Timing=pre smartupdate
[Windows Registry5]
Root Key=HKEY_LOCAL_MACHINE
;*** LOCALIZE ME BABY ***
Key=Software\RetroZilla\RetroZilla\1.1 (en)\Uninstall
Key=Software\RetroZilla\RetroZilla\2.0 (en)\Uninstall
Name=Uninstall Log Folder
Name Value=[SETUP PATH]\uninstall
Type=REG_SZ
@ -1109,7 +1109,7 @@ Timing=pre smartupdate
[Windows Registry8]
Root Key=HKEY_CURRENT_USER
;*** LOCALIZE ME BABY ***
Key=Software\RetroZilla\RetroZilla\1.1 (en)
Key=Software\RetroZilla\RetroZilla\2.0 (en)
Name=
Name Value=
Type=REG_SZ
@ -1123,7 +1123,7 @@ Timing=pre smartupdate
[Windows Registry9]
Root Key=HKEY_CURRENT_USER
;*** LOCALIZE ME BABY ***
Key=Software\RetroZilla\RetroZilla\1.1 (en)\Main
Key=Software\RetroZilla\RetroZilla\2.0 (en)\Main
Name=Program Folder Path
Name Value=[Default Folder]
Type=REG_SZ
@ -1137,9 +1137,9 @@ Timing=pre smartupdate
[Windows Registry10]
Root Key=HKEY_CURRENT_USER
;*** LOCALIZE ME BABY ***
Key=Software\RetroZilla\RetroZilla\1.1 (en)\Uninstall
Key=Software\RetroZilla\RetroZilla\2.0 (en)\Uninstall
Name=Description
Name Value=RetroZilla (1.1)
Name Value=RetroZilla (2.0)
Type=REG_SZ
Decrypt Key=FALSE
Decrypt Name=FALSE
@ -1151,7 +1151,7 @@ Timing=pre smartupdate
[Windows Registry11]
Root Key=HKEY_CURRENT_USER
;*** LOCALIZE ME BABY ***
Key=Software\RetroZilla\RetroZilla\1.1 (en)\Uninstall
Key=Software\RetroZilla\RetroZilla\2.0 (en)\Uninstall
Name=Uninstall Log Folder
Name Value=[SETUP PATH]\uninstall
Type=REG_SZ
@ -1164,9 +1164,9 @@ Timing=pre smartupdate
[Windows Registry12]
Root Key=HKEY_LOCAL_MACHINE
Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\RetroZilla (1.1)
Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\RetroZilla (2.0)
Name=DisplayName
Name Value=RetroZilla (1.1)
Name Value=RetroZilla (2.0)
Type=REG_SZ
Decrypt Key=FALSE
Decrypt Name=FALSE
@ -1177,10 +1177,10 @@ Timing=post smartupdate
[Windows Registry13]
Root Key=HKEY_LOCAL_MACHINE
Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\RetroZilla (1.1)
Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\RetroZilla (2.0)
Name=UninstallString
;*** LOCALIZE ME BABY ***
Name Value=[WINDIR]\retrozillaUninstall.exe /ua "1.1 (en)"
Name Value=[WINDIR]\retrozillaUninstall.exe /ua "2.0 (en)"
Type=REG_SZ
Decrypt Key=FALSE
Decrypt Name=FALSE
@ -1208,12 +1208,12 @@ Timing=pre smartupdate
Reg Key Root0=HKEY_LOCAL_MACHINE
Product Name0=RetroZilla
Product Reg Key0=Software\RetroZilla\RetroZilla
Current Version0=1.1 (en)
Current Version0=2.0 (en)
Reg Key Root1=HKEY_CURRENT_USER
Product Name1=RetroZilla
Product Reg Key1=Software\RetroZilla\RetroZilla
Current Version1=1.1 (en)
Current Version1=2.0 (en)
@ -1249,7 +1249,7 @@ Program Folder=[Default Folder]
[Program Folder0-Shortcut0]
File=[SETUP PATH]\uninstall\retrozillaUninstall.exe
Arguments=/ua "1.1 (en)"
Arguments=/ua "2.0 (en)"
Working Dir=[SETUP PATH]
Description=Uninstall RetroZilla
Icon Path=[SETUP PATH]\uninstall\retrozillaUninstall.exe

4
xpinstall/packager/windows/deflenus.js
View File

@ -106,7 +106,7 @@ var regName = "defaults/mozilla/en-US";
// --- END CHANGABLE STUFF ---
srDest = 1;
err = initInstall(prettyName, regName, "1.1.0.0000000000");
err = initInstall(prettyName, regName, "2.0.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
@ -117,7 +117,7 @@ if(verifyDiskSpace(fProgram, srDest))
setPackageFolder(fProgram);
err = addDirectory("",
"1.1.0.0000000000",
"2.0.0.0000000000",
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram

4
xpinstall/packager/windows/inspector.js
View File

@ -95,13 +95,13 @@ function getPlatform()
return platformNode;
}
var err = initInstall("DOM Inspector", "Inspector", "1.1.0.0000000000");
var err = initInstall("DOM Inspector", "Inspector", "2.0.0.0000000000");
logComment("initInstall: " + err);
var fProgram = getFolder("Program");
logComment("fProgram: " + fProgram);
err = addDirectory("", "1.1.0.0000000000", "bin", fProgram, "", true);
err = addDirectory("", "2.0.0.0000000000", "bin", fProgram, "", true);
logComment("addDirectory: " + err);
addFile("Inspector Command Line Handler",

2
xpinstall/packager/windows/langenus.js
View File

@ -117,7 +117,7 @@ var platformName = langcode + "-" + platformNode + ".jar";
var localeName = "locale/" + chromeNode + "/";
srDest = 1;
err = initInstall(prettyName, regName, "1.1.0.0000000000");
err = initInstall(prettyName, regName, "2.0.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");

18
xpinstall/packager/windows/mail.js
View File

@ -128,12 +128,12 @@ function registerProgramFolderKey(winreg, fFolderPath)
subkey = "SOFTWARE\\RetroZilla\\RetroZilla";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "CurrentVersion", "1.1 (en)");
err = winreg.setValueString(subkey, "CurrentVersion", "2.0 (en)");
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\1.1 (en)";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.0 (en)";
winreg.createKey(subkey,"");
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\1.1 (en)\\Main";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.0 (en)\\Main";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "Program Folder Path", fFolderPath);
}
@ -256,7 +256,7 @@ function createShortcuts()
}
logComment("folderQuickLaunchExists: " + folderQuickLaunchExists);
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\1.1 (en)\\Main";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.0 (en)\\Main";
fFolderPathStr = winreg.getValueString(subkey, "Program Folder Path");
if((fFolderPathStr == "") || (fFolderPathStr == null))
{
@ -351,7 +351,7 @@ function createShortcuts()
data = "\"" + fProgram + "RetroZilla.exe\" -mail";
winreg.setValueString(subkey + "\\shell\\open\\command", "", data);
data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"1.1 (en)\" /hs mail";
data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.0 (en)\" /hs mail";
winreg.setValueString(subkey + "\\InstallInfo", "HideIconsCommand", data);
// set this value to 0 because we're not creating the mail shortcuts yet.
@ -360,7 +360,7 @@ function createShortcuts()
data = "\"" + fProgram + "RetroZilla.exe\" -silent -nosplash -setDefaultMail";
winreg.setValueString(subkey + "\\InstallInfo", "ReinstallCommand", data);
data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"1.1 (en)\" /ss mail";
data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.0 (en)\" /ss mail";
winreg.setValueString(subkey + "\\InstallInfo", "ShowIconsCommand", data);
}
}
@ -407,7 +407,7 @@ function updateMapi()
// uninstaller already has a special way to deal with restoring the
// appropriate previous Mapi32.dll.
addFile("",
"1.1.0.0000000000",
"2.0.0.0000000000",
"bin/mozMapi32.dll", // file name in jar to extract
getFolder("Win System"), // Where to put this file (Returned from getFolder)
"Mapi32.dll", // new name when installed
@ -473,7 +473,7 @@ var err;
var fProgram;
srDest = 1;
err = initInstall("RetroZilla Mail", "Mail", "1.1.0.0000000000");
err = initInstall("RetroZilla Mail", "Mail", "2.0.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
@ -485,7 +485,7 @@ if(verifyDiskSpace(fProgram, srDest))
upgradeCleanup();
err = addDirectory("",
"1.1.0.0000000000",
"2.0.0.0000000000",
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram

2
xpinstall/packager/windows/regus.js
View File

@ -112,7 +112,7 @@ var chromeName = chromeNode + ".jar";
var localeName = "locale/" + chromeNode + "/";
srDest = 1;
err = initInstall(prettyName, regName, "1.1.0.0000000000");
err = initInstall(prettyName, regName, "2.0.0.0000000000");
logComment("initInstall: " + err);
if (platformNode == 'mac')

4
xpinstall/packager/windows/reporter.js
View File

@ -95,7 +95,7 @@ function getPlatform()
return platformNode;
}
var err = initInstall("Website Reporter", "Reporter", "1.1.0.0000000000");
var err = initInstall("Website Reporter", "Reporter", "2.0.0.0000000000");
logComment("initInstall: " + err);
var fProgram = getFolder("Program");
@ -104,7 +104,7 @@ var srDest = 1;
if (verifyDiskSpace(fProgram, srDest))
{
err = addDirectory("", "1.1.0.0000000000", "bin", fProgram, "", true);
err = addDirectory("", "2.0.0.0000000000", "bin", fProgram, "", true);
logComment("addDirectory: " + err);
var jarFolder = getFolder("Chrome", "reporter.jar");

4
xpinstall/packager/windows/spellcheck.js
View File

@ -97,7 +97,7 @@ function getPlatform()
var srDest = 1;
var err = initInstall("RetroZilla Myspell Spellchecker", "Spellchecker", "1.1.0.0000000000");
var err = initInstall("RetroZilla Myspell Spellchecker", "Spellchecker", "2.0.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
@ -108,7 +108,7 @@ if (verifyDiskSpace(fProgram, srDest))
setPackageFolder(fProgram);
addDirectory("Spellchecker",
"1.1.0.0000000000",
"2.0.0.0000000000",
"bin",
fProgram,
"");

4
xpinstall/packager/windows/sroaming.js
View File

@ -95,13 +95,13 @@ function getPlatform()
return platformNode;
}
var err = initInstall("SRoaming v0.1", "Roaming", "1.1.0.0000000000");
var err = initInstall("SRoaming v0.1", "Roaming", "2.0.0.0000000000");
logComment("initInstall: " + err);
var fProgram = getFolder("Program");
logComment("fProgram: " + fProgram);
err = addDirectory("", "1.1.0.0000000000", "bin", fProgram, "", true);
err = addDirectory("", "2.0.0.0000000000", "bin", fProgram, "", true);
logComment("addDirectory: " + err);
addFile("SRoaming Chrome",

4
xpinstall/packager/windows/talkback.js
View File

@ -108,7 +108,7 @@ var err;
var communicatorFolder;
srDest = 1;
err = initInstall("Quality Feedback Utility", "Quality Feedback Utility", "1.1.0.0000000000");
err = initInstall("Quality Feedback Utility", "Quality Feedback Utility", "2.0.0.0000000000");
logComment("initInstall: " + err);
communicatorFolder = getFolder("Communicator");
@ -120,7 +120,7 @@ if(verifyDiskSpace(communicatorFolder, srDest))
upgradeCleanup();
err = addDirectory("",
"1.1.0.0000000000",
"2.0.0.0000000000",
"bin", // dir name in jar to extract
communicatorFolder, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to communicatorFolder

2
xpinstall/packager/windows/venkman.js
View File

@ -95,7 +95,7 @@ function getPlatform()
return platformNode;
}
var err = initInstall("JavaScript Debugger", "Venkman", "1.1.0.0000000000");
var err = initInstall("JavaScript Debugger", "Venkman", "2.0.0.0000000000");
logComment("initInstall: " + err);
addFile("Venkman Service",

8
xpinstall/packager/windows/xpcom.js
View File

@ -116,7 +116,7 @@ var fileMsvcrt;
var fileMsvcirt;
srDest = 1;
err = initInstall("Mozilla XPCOM", "XPCOM", "1.1.0.0000000000");
err = initInstall("Mozilla XPCOM", "XPCOM", "2.0.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
@ -137,7 +137,7 @@ if(verifyDiskSpace(fProgram, srDest))
upgradeCleanup();
err = addDirectory("",
"1.1.0.0000000000",
"2.0.0.0000000000",
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
@ -156,7 +156,7 @@ if(verifyDiskSpace(fProgram, srDest))
{
logComment("File not found: " + fileMsvcrt);
addFile("/Microsoft/Shared/msvcrt.dll",
"1.1.0.0000000000",
"2.0.0.0000000000",
"msvcrt.dll", // dir name in jar to extract
fWindowsSystem, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to fProgram
@ -178,7 +178,7 @@ if(verifyDiskSpace(fProgram, srDest))
{
logComment("File not found: " + fileMsvcirt);
addFile("/Microsoft/Shared/msvcirt.dll",
"1.1.0.0000000000",
"2.0.0.0000000000",
"msvcirt.dll", // dir name in jar to extract
fWindowsSystem, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to fProgram

2
xulrunner/app/splash.rc
View File

@ -75,6 +75,7 @@ END
#define IDC_COLRESIZE 4108
#define IDC_ROWRESIZE 4109
#define IDC_VERTICALTEXT 4110
#define IDC_NONE 4112
IDC_SELECTANCHOR CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\select.cur"
IDC_GRAB CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\grab.cur"
@ -87,5 +88,6 @@ IDC_ZOOMOUT CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res
IDC_COLRESIZE CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\col_resize.cur"
IDC_ROWRESIZE CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\row_resize.cur"
IDC_VERTICALTEXT CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\vertical_text.cur"
IDC_NONE CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\none.cur"
#endif

1
xulrunner/app/splashos2.rc
View File

@ -71,6 +71,7 @@ POINTER IDC_ZOOMOUT "..\\..\\widget\\src\\os2\\res\\zoom_out.ptr"
POINTER IDC_ARROWWAIT "..\\..\\widget\\src\\os2\\res\\arrow_wait.ptr"
POINTER IDC_CROSS "..\\..\\widget\\src\\os2\\res\\crosshair.ptr"
POINTER IDC_HELP "..\\..\\widget\\src\\os2\\res\\help.ptr"
POINTER IDC_NONE "..\\..\\widget\\src\\os2\\res\\help.ptr"
ICON IDC_DNDURL "..\\..\\widget\\src\\os2\\res\\dndurl.ico"
ICON IDC_DNDTEXT "..\\..\\widget\\src\\os2\\res\\dndtext.ico"