[mdesktop] r67 committed - ABAD Day 3: Fixed bug while using multiple desktops on windows 8....

[mdes...@googlecode.com]

Revision: 67
Author: jacerox1234
Date: Thu Apr 18 19:09:56 2013
Log: ABAD Day 3: Fixed bug while using multiple desktops on windows 8.
Issue180.
http://code.google.com/p/mdesktop/source/detail?r=67

Modified:
/trunk/License.txt
/trunk/mDesktop.ahk
/trunk/mDesktopSetup.nsi

=======================================
--- /trunk/License.txt Wed Oct 19 22:02:15 2011
+++ /trunk/License.txt Thu Apr 18 19:09:56 2013
@@ -1,8 +1,3 @@
-A. mDesktop End User Licence Agreement
-B. OpenCandy End User License Agreement
-
-A. mDesktop End User Licence Agreement
-
Copyright 2007 Jason Stallings
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,9 +10,3 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-B. OpenCandy End User License Agreement
-
-Jan 26 2010
-
-This installer uses the OpenCandy network to recommend other software you
may find valuable during the installation of this software. OpenCandy
collects NON-personally identifiable information about this installation
and the recommendation process. Collection of this information ONLY occurs
during this installation and the recommendation process; in accordance with
OpenCandy's Privacy Policy, available at www.opencandy.com/privacy-policy
=======================================
--- /trunk/mDesktop.ahk Mon Apr 15 15:54:44 2013
+++ /trunk/mDesktop.ahk Thu Apr 18 19:09:56 2013
@@ -1,4 +1,4 @@
-; Initially created by jacerox1234
+; Initially created by Jason Stallings
; Updated by IamTheFij
; Source available http://code.google.com/p/mdesktop

@@ -1380,6 +1380,11 @@
win_desktop%id%:=
}

+ if (windowClass="Shell_SecondaryTrayWnd")
+ {
+ windows%index%%A_Index%=
+ win_desktop%id%:=
+ }
If (windowTitle = "Start" and windowClass="Button")
{
windows%index%%A_Index%=
@@ -1617,7 +1622,7 @@

about:
gui 2:add,text,,mDesktop
- gui 2:add,text,,Version: 1.6 Beta 2
+ gui 2:add,text,,Version: 1.6 Beta 4
gui 2:add,text,,By: Jason Stallings
gui 2:add,text,cblue ggourl,code.google.com/p/mdesktop/
gui 2:add,text,,Enhancements by: Ian Fijolek
=======================================
--- /trunk/mDesktopSetup.nsi Wed Oct 19 22:02:15 2011
+++ /trunk/mDesktopSetup.nsi Thu Apr 18 19:09:56 2013
@@ -1,5 +1,26 @@
RequestExecutionLevel admin

+
+
+
+ !define OC_STR_MY_PRODUCT_NAME "mDesktop"
+ ; Please change the key and secret to the ones assigned for your specific
products
+ !define OC_STR_KEY "116ead0e399c7d35ed65678adf799f35"
+ !define OC_STR_SECRET "f13ef28c9a737620ffc7a71135970822"
+ ; Optionally change the path to OCSetupHlp.dll here if it's not in the
same folder
+ ; as your .nsi file. You must specify the relative path from your .nsi
file location.
+ !define OC_OCSETUPHLP_FILE_PATH ".\OCSetupHlp.dll"
+
+
+ !define OC_LOADING_SCREEN_CAPTION " "
+ !define OC_LOADING_SCREEN_DESCRIPTION " "
+ !define OC_LOADING_SCREEN_MESSAGE "Loading..."
+ !define OC_LOADING_SCREEN_FONTFACE "Arial"
+ !define OC_LOADING_SCREEN_FONTSIZE 100
+
+
+
+
;--------------------------------
;Variables

@@ -16,7 +37,7 @@

;Name and file
Name "mDesktop"
- OutFile "mDesktopSetup1.6b3.exe"
+ OutFile "mDesktopSetup1.6b4.exe"

;Default installation folder
InstallDir "$PROGRAMFILES\mDesktop"
@@ -27,15 +48,14 @@
;--------------------------------
;Interface Settings

- !define MUI_HEADERIMAGE
- !define MUI_HEADERIMAGE_BITMAP "header.bmp" ; optional
-
!define MUI_ABORTWARNING

;--------------------------------
;Pages

!insertmacro MUI_PAGE_LICENSE "License.txt"
+
+

!insertmacro MUI_PAGE_DIRECTORY

@@ -45,21 +65,18 @@
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "mDesktop"


-
- !define OC_STR_MY_PRODUCT_NAME "mDesktop"
- ; Please change the key and secret to the ones assigned for your specific
products
- !define OC_STR_KEY "116ead0e399c7d35ed65678adf799f35"
- !define OC_STR_SECRET "f13ef28c9a737620ffc7a71135970822"
+



- !include "OCSetupHlp.nsh"
+ ; !include "OCSetupHlp.nsh"



- !insertmacro OpenCandyReserveFile
+
!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
- !insertmacro OpenCandyOfferPage
+ ; !insertmacro OpenCandyLoadingPage
+ ; !insertmacro OpenCandyOfferPage
!insertmacro MUI_PAGE_INSTFILES

!insertmacro MUI_UNPAGE_CONFIRM
@@ -73,10 +90,10 @@
;--------------------------------
;Installer Sections

-Section "-OpenCandyEmbedded"
+;Section "-OpenCandyEmbedded"
; Handle any offers the user accepted
- !insertmacro OpenCandyInstallEmbedded
-SectionEnd
+ ;!insertmacro OpenCandyInstallEmbedded
+;SectionEnd

Section "Main" SecDummy

@@ -193,7 +210,7 @@
; e.g. MUI_LANGDLL_DISPLAY or calls to LangDLL, you must insert
; this macro after the language selection code in order for
; OpenCandy to detect the user-selected language.
- !insertmacro
OpenCandyAsyncInit "${OC_STR_MY_PRODUCT_NAME}" "${OC_STR_KEY}" "${OC_STR_SECRET}"
${OC_INIT_MODE_NORMAL}
+; !insertmacro
OpenCandyAsyncInit "${OC_STR_MY_PRODUCT_NAME}" "${OC_STR_KEY}" "${OC_STR_SECRET}"
${OC_INIT_MODE_NORMAL} ${OC_INIT_PERFORM_NOW}
# [/OpenCandy]
FunctionEnd

@@ -201,7 +218,7 @@
Function .onInstSuccess
# [OpenCandy]
; Signal successful installation, download and install accepted offers
- !insertmacro OpenCandyOnInstSuccess
+ ;!insertmacro OpenCandyOnInstSuccess
# [/OpenCandy]
FunctionEnd

@@ -209,12 +226,12 @@
Function .onGUIEnd
# [OpenCandy]
; Inform the OpenCandy API that the installer is about to exit
- !insertmacro OpenCandyOnGuiEnd
+; !insertmacro OpenCandyOnGuiEnd
# [/OpenCandy]
FunctionEnd


# [OpenCandy]
; Have the compiler perform some basic OpenCandy API implementation checks
- !insertmacro OpenCandyAPIDoChecks
+ ;!insertmacro OpenCandyAPIDoChecks
# [/OpenCandy