ext/toolchain/commands1.py

@@ -430,7 +430,7 @@ def configureCore(self, target="", extraArgs=""):
 		if generator.cmakeName.find('Unix Makefiles') != -1:
 			cmake_args += ' -DCMAKE_BUILD_TYPE=' + target.capitalize()
 			
-		elif sys.platform == "darwin":
+		if sys.platform == "darwin":
 			macSdkMatch = re.match("(\d+)\.(\d+)", self.macSdk)
 			if not macSdkMatch:
 				raise Exception("unknown osx version: " + self.macSdk)
@@ -499,7 +499,7 @@ def configureGui(self, target="", extraArgs=""):
 			
 			qmake_cmd_string += " QMAKE_MACOSX_DEPLOYMENT_TARGET=" + version
 
-			(qMajor, qMinor, qRev) = self.getQmakeVersion()
+			(qMajor, qMinor, qRev, qLibDir) = self.getQmakeVersion()
 			if qMajor <= 4:
 				# 4.6: qmake takes full sdk dir.
 				qmake_cmd_string += " QMAKE_MAC_SDK=" + sdkDir
@@ -522,16 +522,17 @@ def configureGui(self, target="", extraArgs=""):
 
 	def getQmakeVersion(self):
 		version = commands.getoutput("qmake --version")
-		result = re.search('(\d+)\.(\d+)\.(\d)', version)
+		result = re.search('(\d+)\.(\d+)\.(\d) in (.*)', version)
 		
 		if not result:
 			raise Exception("Could not get qmake version.")
  
 		major = int(result.group(1))
 		minor = int(result.group(2))
 		rev = int(result.group(3))
+		libDir = str(result.group(4))
 		
-		return (major, minor, rev)
+		return (major, minor, rev, libDir)
 
 	def getMacSdkDir(self):
 		sdkName = "macosx" + self.macSdk
@@ -718,7 +719,7 @@ def makeGui(self, targets, args=""):
 				if sys.platform == 'darwin' and not "clean" in args:
 					self.macPostGuiMake(target)
 
-					self.fixQtFrameworksLayout(target)
+					#self.fixQtFrameworksLayout(target)
 			else:
 				raise Exception('Unsupported platform: ' + sys.platform)
 
@@ -767,22 +768,27 @@ def macPostGuiMake(self, target):
 			if err != 0:
 				raise Exception(bin + " failed with error: " + str(err))
 
-			(qMajor, qMinor, qRev) = self.getQmakeVersion()
+			(qMajor, qMinor, qRev, qLibDir) = self.getQmakeVersion()
 			if qMajor <= 4:
-				frameworkRootDir = "/Library/Frameworks"
+				frameworkRootDir = qLibDir
 			else:
 				# TODO: auto-detect, qt can now be installed anywhere.
-				frameworkRootDir = "/Developer/Qt5.2.1/5.2.1/clang_64/lib"
+				#frameworkRootDir = "/Developer/Qt5.2.1/5.2.1/clang_64/lib"
+				frameworkRootDir = qLibDir
 
 			target = bundleTargetDir + "/Contents/Frameworks"
 
 			# copy the missing Info.plist files for the frameworks.
 			for root, dirs, files in os.walk(target):
 				for dir in dirs:
 					if dir.startswith("Qt"):
-						shutil.copy(
-							frameworkRootDir + "/" + dir + "/Contents/Info.plist",
-							target + "/" + dir + "/Resources/")
+						tgt = target + "/" + dir + "/Resources/Info.plist"
+						if not os.path.isfile(tgt):
+							shutil.copy(
+									frameworkRootDir + "/" + dir + "/Resources/Info.plist",
+									target + "/" + dir + "/Resources/")
+						else:
+							print "Skipping existing plist", tgt
 
 	def symlink(self, source, target):
 		if not os.path.exists(target):

src/gui/src/AppConfig.cpp

@@ -128,7 +128,7 @@ void AppConfig::loadSettings()
 	m_AutoConfig = settings().value("autoConfig", true).toBool();
 	m_ElevateMode = settings().value("elevateMode", false).toBool();
 	m_AutoConfigPrompted = settings().value("autoConfigPrompted", false).toBool();
-	m_Edition = settings().value("edition", Unknown).toInt();
+	m_Edition = settings().value("edition", Pro).toInt();
 	m_ActivateEmail = settings().value("activateEmail", "").toString();
 	m_CryptoEnabled = settings().value("cryptoEnabled", false).toBool();
 	m_AutoHide = settings().value("autoHide", false).toBool();

src/gui/src/SetupWizard.cpp

@@ -29,7 +29,7 @@
 SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) :
 	m_MainWindow(mainWindow),
 	m_StartMain(startMain),
-	m_Edition(Unknown),
+	m_Edition(Pro),
 	m_LoginAttemps(0)
 {
 	setupUi(this);

src/gui/src/WebClient.cpp

@@ -31,8 +31,10 @@ int WebClient::getEdition(
 		QMessageBox& message,
 		QWidget* w)
 {
+
 	QString responseJson;
-	int edition = Unknown;
+	int edition = Pro;
+    return edition;
 	try {
 		responseJson = request(email, password);
 	}

src/lib/platform/OSXScreen.cpp

@@ -466,9 +466,9 @@ OSXScreen::constructMouseButtonEventMap()
 {
 	const CGEventType source[NumButtonIDs][3] = {
 		{kCGEventLeftMouseUp, kCGEventLeftMouseDragged, kCGEventLeftMouseDown},
-		{kCGEventOtherMouseUp, kCGEventOtherMouseDragged, kCGEventOtherMouseDown},
 		{kCGEventRightMouseUp, kCGEventRightMouseDragged, kCGEventRightMouseDown},
 		{kCGEventOtherMouseUp, kCGEventOtherMouseDragged, kCGEventOtherMouseDown},
+		{kCGEventOtherMouseUp, kCGEventOtherMouseDragged, kCGEventOtherMouseDown},
 		{kCGEventOtherMouseUp, kCGEventOtherMouseDragged, kCGEventOtherMouseDown}
 	};
 
@@ -541,7 +541,7 @@ void
 OSXScreen::fakeMouseButton(ButtonID id, bool press)
 {
 	// Buttons are indexed from one, but the button down array is indexed from zero
-	UInt32 index = id - kButtonLeft;
+	UInt32 index = mapSynergyButtonToMac(id) - kButtonLeft;
 	if (index >= NumButtonIDs) {
 		return;
 	}
@@ -590,11 +590,11 @@ OSXScreen::fakeMouseButton(ButtonID id, bool press)
     
     EMouseButtonState state = press ? kMouseButtonDown : kMouseButtonUp;
     
-    LOG((CLOG_DEBUG1 "faking mouse button id: %d press: %s", id, press ? "pressed" : "released"));
+    LOG((CLOG_DEBUG1 "faking mouse button id: %d press: %s", index, press ? "pressed" : "released"));
     
     MouseButtonEventMapType thisButtonMap = MouseButtonEventMap[index];
     CGEventType type = thisButtonMap[state];
-    
+
     CGEventRef event = CGEventCreateMouseEvent(NULL, type, pos, index);
     
     CGEventSetIntegerValueField(event, kCGMouseEventClickState, m_clickState);
@@ -1442,6 +1442,21 @@ OSXScreen::onHotKey(EventRef event) const
 	return true;
 }
 
+ButtonID
+OSXScreen::mapSynergyButtonToMac(UInt16 button) const
+{
+    switch (button) {
+    case 1:
+        return kButtonLeft;
+    case 2:
+        return kMacButtonMiddle;
+    case 3:
+        return kMacButtonRight;
+    }
+
+    return static_cast<ButtonID>(button);
+}
+
 ButtonID 
 OSXScreen::mapMacButtonToSynergy(UInt16 macButton) const
 {

src/lib/platform/OSXScreen.h

@@ -138,6 +138,9 @@ class OSXScreen : public PlatformScreen {
 	void                showCursor();
 	void                hideCursor();
 
+	// map synergy mouse button to mac buttons
+	ButtonID			mapSynergyButtonToMac(UInt16) const;
+
 	// map mac mouse button to synergy buttons
 	ButtonID			mapMacButtonToSynergy(UInt16) const;
 

src/lib/synergy/mouse_types.h

@@ -33,6 +33,9 @@ static const ButtonID	kButtonLeft   = 1;
 static const ButtonID	kButtonMiddle = 2;
 static const ButtonID	kButtonRight  = 3;
 static const ButtonID	kButtonExtra0 = 4;
+
+static const ButtonID   kMacButtonRight = 2;
+static const ButtonID   kMacButtonMiddle = 3;
 //@}
 
 static const UInt8      NumButtonIDs  = 5;