Changeset 1805


Ignore:
Timestamp:
May 23, 2015, 11:18:47 PM (10 years ago)
Author:
Gregg Young
Message:

Add option to restart desktop to JAVA object creation to prevent loss of icon on opening object settings. Ticket 37

Location:
trunk/dll
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/fm3res.rc

    r1804 r1805  
    7878  02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
    7979                menu item on a jar file.
     80  23 May 15 GKY Option to restart desktop to prevent icon loss from JAVA object
    8081 
    8182***********************************************************************/
     
    34143415    IDS_LZIPLIMITATION                    "Lzip Limitation"
    34153416    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"
    34163419
    34173420
  • trunk/dll/fm3str.h

    r1777 r1805  
    5555                Use the test archive string from the first working archive description.
    5656                Enhance the error message. Ticket 502
     57  23 May 15 GKY Option to restart desktop to prevent icon loss from JAVA object
    5758
    5859***********************************************************************/
     
    912913#define IDS_CHANGECMDLINELENGTHDEFAULT                        880
    913914#define IDS_LZIPLIMITATION                                    881
    914 #define IDS_LZIPNOLIST                                        882 
    915 #define IDS_SPARE_883                                         883
    916 #define IDS_SPARE_884                                         884
     915#define IDS_LZIPNOLIST                                        882
     916#define IDS_RESTARTDESKTOP                                    883  // 23 May 2015 GKY
     917#define IDS_SETTINGLOSEICON                                   884  // 23 May 2015 GKY
    917918#define IDS_SPARE_885                                         885
    918919#define IDS_SOURCEISATEXT                                     886
  • trunk/dll/shadow.c

    r1803 r1805  
    1919  02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
    2020                menu item on a jar file.
     21  23 May 15 GKY Option to restart desktop to prevent icon loss from JAVA object
    2122
    2223***********************************************************************/
     
    6263                            CHAR * cnr);
    6364static HOBJECT CreateShadowObject(CHAR * objtitle, CHAR * location, CHAR * path,
    64                            BOOL executable, CHAR * cnr);
     65                                  BOOL executable, CHAR * cnr);
     66BOOL32 EXPENTRY WinRestartWorkplace(VOID);
    6567
    6668HOBJECT CreateProgramObject(CHAR * objtitle, CHAR * location, CHAR * path,
     
    105107  CHAR javaexe[CCHMAXPATH] = {0};
    106108  CHAR icon[CCHMAXPATH] = {0};
    107   //PSZ env = 0;
    108   //FILESTATUS3 fsa;
    109109
    110110  if (!cnr)
     
    334334          CreateShadowObject(p, (obj) ? szBuffer : NULL, szDir, 0, cnr);
    335335        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
    337339            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          }
    338347        else if (!(apt & (FAPPTYP_NOTWINDOWCOMPAT | FAPPTYP_WINDOWCOMPAT | FAPPTYP_WINDOWAPI |
    339348                          FAPPTYP_BOUND | FAPPTYP_DOS | FAPPTYP_WINDOWSREAL |
Note: See TracChangeset for help on using the changeset viewer.