Changeset 3 for trunk/mediafolder

Timestamp:

Jul 13, 2017, 4:16:49 AM (8 years ago)

Author:

stevenhl

Message:

Import modifications from cwmm-eCS-Refresh-13_05_05.zip dated 2005-05-13

Location:

trunk/mediafolder

Files:

• c/mediafldr/mediadialogprocs.cpp (modified) (1 diff)
• c/mediafldr/mediafolderoverridenwpmethods.cpp (modified) (3 diffs)
• include/mediafolder.hh (added)
• makefile (modified) (2 diffs)

trunk/mediafolder/c/mediafldr/mediadialogprocs.cpp

@@ -1698 +1698 @@
           }
         }
-        /* Start timer which triggers time calculation */
-        WinStartTimer(WinQueryAnchorBlock(hwnd),hwnd, IDTIMER_STATUS, 300);
+        /* 
+           FIXME:
+           Start timer which triggers time calculation. The timer is rather long so the objects may
+           awake first. This is not yet bullet proof, because if there're a lot of objects in the folder
+           the time will be too short. */
+        WinStartTimer(WinQueryAnchorBlock(hwnd),hwnd, IDTIMER_STATUS, 5000);
         return (MRESULT)FALSE;
       }

trunk/mediafolder/c/mediafldr/mediafolderoverridenwpmethods.cpp

@@ -964 +964 @@
 }
 
-#if 0
+//#if 0
 BOOL CWMediaFolder::wpRefresh(ULONG ulView, PVOID pReserved)
 {
   somId mySomId;
-
-    if((mySomId=somIdFromString("wpAddSettingsPages"))!=NULLHANDLE) {
-      rc=((somTD_WPObject_wpAddSettingsPages)
+  ULONG rc;
+
+    if((mySomId=somIdFromString("wpRefresh"))!=NULLHANDLE) {
+      rc=((somTD_WPFileSystem_wpRefresh)
           somParentNumResolve(__ClassObject->somGetPClsMtabs(),
                               1,
                               __ClassObject->
-                              somGetMethodToken(mySomId))                    
-          )(this,hwndNotebook);  
+                              somGetMethodToken(mySomId))                  
+          )(this, ulView,pReserved);  
       SOMFree(mySomId);
     }
@@ -981 +982 @@
       rc=CWProgFolder::wpRefresh(ulView, pReserved);
 
-}
-#endif
+    /* Start timer which triggers time calculation */
+    WinStartTimer(WinQueryAnchorBlock(hwndBottom),hwndBottom, IDTIMER_STATUS, 300);
+    return rc;
+}
+//#endif
 
 BOOL CWMediaFolder::wpAddSettingsPages(HWND hwndNotebook)
@@ -988 +992 @@
         ULONG rc;
     somId mySomId;
-    
+
     if((mySomId=somIdFromString("wpAddSettingsPages"))!=NULLHANDLE) {
       rc=((somTD_WPObject_wpAddSettingsPages)

trunk/mediafolder/makefile

@@ -222 +222 @@
         cp ./install/freedbgr.ins ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/FreeDB/
         cp Skripte_ger/* ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/Skripte/
-#       -cd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin && lxlite *
-#       -cd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/DLL && lxlite *
-#       -cd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/FreeDB && lxlite *
+        -cd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin && lxlite *
+        -cd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/DLL && lxlite *
+        -cd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/FreeDB && lxlite *
 
 done:
@@ -246 +246 @@
         cp ./c/createcd/createcd.exe  ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/
         cp ./mediafolder.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.dll
-        cp ./res/obj/mediafolder_de.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mfldr_en.dll
+        cp ./res/obj/mediafolder_en.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mfldr_en.dll
         cp ./help/mediafldr.hlp ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.hlp
         cp ./install/MEDIAFLD.ins  ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/MEDIAFLD.INS