Side by Side Diff: src/engine/engine.rc
Issue 10897028:
Create a shared dictionary class for plugin and engine (Closed)
Patch Set:
Created June 7, 2013, 12:42 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« WixInstaller/adblockplusie.wxs ('K')
|
« src/engine/Updater.cpp ('k')
|
src/engine/main.cpp » ('j')
|
src/plugin/AdblockPlusClient.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 #include "Resource.h" | 1 #include "Resource.h" |
| 2 #include "winres.h" | 2 #include "winres.h" |
| 3 | 3 |
| 4 VS_VERSION_INFO VERSIONINFO | 4 VS_VERSION_INFO VERSIONINFO |
| 5 FILEVERSION 0,0,2,0 | 5 FILEVERSION 0,0,2,0 |
| 6 PRODUCTVERSION 0,0,2,0 | 6 PRODUCTVERSION 0,0,2,0 |
| 7 FILEFLAGSMASK 0x3fL | 7 FILEFLAGSMASK 0x3fL |
| 8 #ifdef _DEBUG | 8 #ifdef _DEBUG |
| 9 FILEFLAGS 0x1L | 9 FILEFLAGS 0x1L |
| 10 #else | 10 #else |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 29 END | 29 END |
| 30 END | 30 END |
| 31 BLOCK "VarFileInfo" | 31 BLOCK "VarFileInfo" |
| 32 BEGIN | 32 BEGIN |
| 33 VALUE "Translation", 0x409, 1200 | 33 VALUE "Translation", 0x409, 1200 |
| 34 END | 34 END |
| 35 END | 35 END |
| 36 | 36 |
| 37 IDD_UPDATEDIALOG DIALOGEX 0, 0, 159, 86 | 37 IDD_UPDATEDIALOG DIALOGEX 0, 0, 159, 86 |
| 38 STYLE WS_EX_TOPMOST | DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAP TION | 38 STYLE WS_EX_TOPMOST | DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAP TION |
| 39 CAPTION "Update Adblock Plus" | 39 CAPTION "Adblock Plus update available" |
| 40 FONT 8, "Microsoft Sans Serif", 400, 0, 0x0 | 40 FONT 8, "Microsoft Sans Serif", 400, 0, 0x0 |
| 41 BEGIN | 41 BEGIN |
| 42 DEFPUSHBUTTON "Yes",IDOK,22,65,50,14 | 42 DEFPUSHBUTTON "Yes",IDOK,22,65,50,14 |
| 43 PUSHBUTTON "No",IDCANCEL,82,65,50,14 | 43 PUSHBUTTON "No",IDCANCEL,82,65,50,14 |
| 44 LTEXT "A new version of Adblock Plus is available for download",ID C_UPDATETEXT,7,10,142,17 | 44 LTEXT "A new version of Adblock Plus is available for download.",I DC_UPDATETEXT,7,10,142,17 |
| 45 LTEXT "Do you wish to download it now?",IDC_DOYOU,7,39,145,8 | 45 LTEXT "Do you wish to download and install it now?",IDC_DOYOU,7,39 ,145,8 |
| 46 END | 46 END |
| 47 | 47 |
| 48 IDD_DOWNLOADDIALOG DIALOGEX 0, 0, 259, 68 | 48 IDD_DOWNLOADDIALOG DIALOGEX 0, 0, 259, 68 |
| 49 STYLE WS_EX_TOPMOST | DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAP TION | 49 STYLE WS_EX_TOPMOST | DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAP TION |
| 50 EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | 50 EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW |
| 51 CAPTION "Downloading Adblock Plus" | 51 CAPTION "Downloading Adblock Plus" |
| 52 FONT 8, "Microsoft Sans Serif", 0, 0, 0x0 | 52 FONT 8, "Microsoft Sans Serif", 0, 0, 0x0 |
| 53 BEGIN | 53 BEGIN |
| 54 PUSHBUTTON "Cancel",IDCANCEL,202,47,50,14 | 54 PUSHBUTTON "Cancel",IDCANCEL,202,47,50,14 |
| 55 CONTROL "",IDC_PROGRESS1,"msctls_progress32",WS_BORDER,7,28,245,12 | 55 CONTROL "",IDC_PROGRESS1,"msctls_progress32",WS_BORDER,7,28,245,12 |
| 56 LTEXT "Please wait ...",IDC_INSTALLMSG,7,7,245,17 | 56 LTEXT "Please wait...",IDC_INSTALLMSG,7,7,245,17 |
| 57 END | 57 END |
| OLD | NEW |
« WixInstaller/adblockplusie.wxs ('K')
|
« src/engine/Updater.cpp ('k')
|
src/engine/main.cpp » ('j')
|
src/plugin/AdblockPlusClient.cpp » ('J')
