Changeset 1805

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:

• fm3res.rc (modified) (2 diffs)
• fm3str.h (modified) (2 diffs)
• shadow.c (modified) (4 diffs)

trunk/dll/fm3res.rc

@@ -78 +78 @@
   02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
                 menu item on a jar file.
+  23 May 15 GKY Option to restart desktop to prevent icon loss from JAVA object
   
 ***********************************************************************/
@@ -3414 +3415 @@
     IDS_LZIPLIMITATION                    "Lzip Limitation"
     IDS_LZIPNOLIST                        "Lzip doesn't have a list files option"
+    IDS_RESTARTDESKTOP                    "Restart Desktop?"
+    IDS_SETTINGLOSEICON                   "If you don't restart the desktop before opening in settings view the icon will be lost"
 
 

trunk/dll/fm3str.h

@@ -55 +55 @@
                 Use the test archive string from the first working archive description.
                 Enhance the error message. Ticket 502
+  23 May 15 GKY Option to restart desktop to prevent icon loss from JAVA object
 
 ***********************************************************************/
@@ -912 +913 @@
 #define IDS_CHANGECMDLINELENGTHDEFAULT                        880
 #define IDS_LZIPLIMITATION                                    881
-#define IDS_LZIPNOLIST                                        882 
-#define IDS_SPARE_883                                         883
-#define IDS_SPARE_884                                         884
+#define IDS_LZIPNOLIST                                        882
+#define IDS_RESTARTDESKTOP                                    883  // 23 May 2015 GKY
+#define IDS_SETTINGLOSEICON                                   884  // 23 May 2015 GKY
 #define IDS_SPARE_885                                         885
 #define IDS_SOURCEISATEXT                                     886

trunk/dll/shadow.c

@@ -19 +19 @@
   02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
                 menu item on a jar file.
+  23 May 15 GKY Option to restart desktop to prevent icon loss from JAVA object
 
 ***********************************************************************/
@@ -62 +63 @@
                             CHAR * cnr);
 static HOBJECT CreateShadowObject(CHAR * objtitle, CHAR * location, CHAR * path,
-                           BOOL executable, CHAR * cnr);
+                                  BOOL executable, CHAR * cnr);
+BOOL32 EXPENTRY WinRestartWorkplace(VOID);
 
 HOBJECT CreateProgramObject(CHAR * objtitle, CHAR * location, CHAR * path,
@@ -105 +107 @@
   CHAR javaexe[CCHMAXPATH] = {0};
   CHAR icon[CCHMAXPATH] = {0};
-  //PSZ env = 0;
-  //FILESTATUS3 fsa;
 
   if (!cnr)
@@ -334 +334 @@
           CreateShadowObject(p, (obj) ? szBuffer : NULL, szDir, 0, cnr);
         else if (JAVA)
-          if (CreateJAVAProgramObject(p, (obj) ? szBuffer : NULL, szDir, cnr))
+          if (CreateJAVAProgramObject(p, (obj) ? szBuffer : NULL, szDir, cnr)) {
+            ULONG ulResult;
+
             apt |= FAPPTYP_BOUND;
+            ulResult = saymsg(MB_OKCANCEL | MB_ICONQUESTION | MB_DEFBUTTON1, HWND_DESKTOP,
+                              GetPString(IDS_RESTARTDESKTOP),
+                              GetPString(IDS_SETTINGLOSEICON));
+            if (ulResult == MBID_OK){
+              WinRestartWorkplace();
+            }
+          }
         else if (!(apt & (FAPPTYP_NOTWINDOWCOMPAT | FAPPTYP_WINDOWCOMPAT | FAPPTYP_WINDOWAPI |
                           FAPPTYP_BOUND | FAPPTYP_DOS | FAPPTYP_WINDOWSREAL |