Changeset 1805
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/fm3res.rc
r1804 r1805 78 78 02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object" 79 79 menu item on a jar file. 80 23 May 15 GKY Option to restart desktop to prevent icon loss from JAVA object 80 81 81 82 ***********************************************************************/ … … 3414 3415 IDS_LZIPLIMITATION "Lzip Limitation" 3415 3416 IDS_LZIPNOLIST "Lzip doesn't have a list files option" 3417 IDS_RESTARTDESKTOP "Restart Desktop?" 3418 IDS_SETTINGLOSEICON "If you don't restart the desktop before opening in settings view the icon will be lost" 3416 3419 3417 3420 -
trunk/dll/fm3str.h
r1777 r1805 55 55 Use the test archive string from the first working archive description. 56 56 Enhance the error message. Ticket 502 57 23 May 15 GKY Option to restart desktop to prevent icon loss from JAVA object 57 58 58 59 ***********************************************************************/ … … 912 913 #define IDS_CHANGECMDLINELENGTHDEFAULT 880 913 914 #define IDS_LZIPLIMITATION 881 914 #define IDS_LZIPNOLIST 882 915 #define IDS_ SPARE_883 883916 #define IDS_S PARE_884 884915 #define IDS_LZIPNOLIST 882 916 #define IDS_RESTARTDESKTOP 883 // 23 May 2015 GKY 917 #define IDS_SETTINGLOSEICON 884 // 23 May 2015 GKY 917 918 #define IDS_SPARE_885 885 918 919 #define IDS_SOURCEISATEXT 886 -
trunk/dll/shadow.c
r1803 r1805 19 19 02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object" 20 20 menu item on a jar file. 21 23 May 15 GKY Option to restart desktop to prevent icon loss from JAVA object 21 22 22 23 ***********************************************************************/ … … 62 63 CHAR * cnr); 63 64 static HOBJECT CreateShadowObject(CHAR * objtitle, CHAR * location, CHAR * path, 64 BOOL executable, CHAR * cnr); 65 BOOL executable, CHAR * cnr); 66 BOOL32 EXPENTRY WinRestartWorkplace(VOID); 65 67 66 68 HOBJECT CreateProgramObject(CHAR * objtitle, CHAR * location, CHAR * path, … … 105 107 CHAR javaexe[CCHMAXPATH] = {0}; 106 108 CHAR icon[CCHMAXPATH] = {0}; 107 //PSZ env = 0;108 //FILESTATUS3 fsa;109 109 110 110 if (!cnr) … … 334 334 CreateShadowObject(p, (obj) ? szBuffer : NULL, szDir, 0, cnr); 335 335 else if (JAVA) 336 if (CreateJAVAProgramObject(p, (obj) ? szBuffer : NULL, szDir, cnr)) 336 if (CreateJAVAProgramObject(p, (obj) ? szBuffer : NULL, szDir, cnr)) { 337 ULONG ulResult; 338 337 339 apt |= FAPPTYP_BOUND; 340 ulResult = saymsg(MB_OKCANCEL | MB_ICONQUESTION | MB_DEFBUTTON1, HWND_DESKTOP, 341 GetPString(IDS_RESTARTDESKTOP), 342 GetPString(IDS_SETTINGLOSEICON)); 343 if (ulResult == MBID_OK){ 344 WinRestartWorkplace(); 345 } 346 } 338 347 else if (!(apt & (FAPPTYP_NOTWINDOWCOMPAT | FAPPTYP_WINDOWCOMPAT | FAPPTYP_WINDOWAPI | 339 348 FAPPTYP_BOUND | FAPPTYP_DOS | FAPPTYP_WINDOWSREAL |
Note:
See TracChangeset
for help on using the changeset viewer.