rhodes 1.5.5 → 2.0.0.beta1

data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj

@@ -304,6 +304,10 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				HEADER_SEARCH_PATHS = ../../shared;
 				INSTALL_PATH = /usr/local/lib;
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fvisibility=hidden",
+				);
 				PRODUCT_NAME = rhosynclib;
 			};
 			name = Debug;
@@ -317,6 +321,10 @@
 				HEADER_SEARCH_PATHS = ../../shared;
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fvisibility=hidden",
+				);
 				PRODUCT_NAME = rhosynclib;
 				SDKROOT = iphoneos2.2.1;
 			};
@@ -374,6 +382,10 @@
 				HEADER_SEARCH_PATHS = ../../shared;
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fvisibility=hidden",
+				);
 				PRODUCT_NAME = rhosynclib;
 				SDKROOT = iphoneos2.2.1;
 			};

data/platform/osx/Rhodes Launcher/launch.rb

@@ -1,12 +1,10 @@
-    require 'find'
+    require 'Find'
     require 'fileutils'
     include FileUtils
 
     chdir File.dirname(__FILE__)
 
     $homedir = `echo ~`.to_s.strip
-    $simdir = "#{$homedir}/Library/Application Support/iPhone Simulator/"
-
     $simapp="#{$homedir}/Library/Application Support/iPhone Simulator/User/Applications"
     $simlink="#{$homedir}/Library/Application Support/iPhone Simulator/User/Library/Preferences"
     $sim="/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications"
@@ -16,31 +14,26 @@
      `killall "iPhone Simulator"`
 
 
-     Find.find($simdir) do |path|
+     Find.find($simapp) do |path|
        if File.basename(path) == "rhorunner.app"
          $guid = File.basename(File.dirname(path))
        end
      end
 
-    Dir.glob($simdir + '*').each do |sdk|
-       simapp = sdk + "/Applications"
-       simlink = sdk + "/Library/Preferences"
+     simrhodes = File.join($simapp,$guid)
+     rm_rf simrhodes
 
-       simrhodes = File.join(simapp,$guid)
-       rm_rf simrhodes
+     mkdir_p File.join(simrhodes,"Documents")
+     mkdir_p File.join(simrhodes,"Library","Preferences")
 
-       mkdir_p File.join(simrhodes,"Documents")
-       mkdir_p File.join(simrhodes,"Library","Preferences")
+     puts `cp -R -p "rhorunner.app" "#{simrhodes}"`
+     puts `ln -f -s "#{$simlink}/com.apple.PeoplePicker.plist" "#{simrhodes}/Library/Preferences/com.apple.PeoplePicker.plist"`
+     puts `ln -f -s "#{$simlink}/.GlobalPreferences.plist" "#{simrhodes}/Library/Preferences/.GlobalPreferences.plist"`
 
-       puts `cp -R -p "rhorunner.app" "#{simrhodes}"`
-       puts `ln -f -s "#{simlink}/com.apple.PeoplePicker.plist" "#{simrhodes}/Library/Preferences/com.apple.PeoplePicker.plist"`
-       puts `ln -f -s "#{simlink}/.GlobalPreferences.plist" "#{simrhodes}/Library/Preferences/.GlobalPreferences.plist"`
- 
-       puts `echo "#{$applog}" > "#{simrhodes}/Documents/rhologpath.txt"`
+     puts `echo "#{$applog}" > "#{simrhodes}/Documents/rhologpath.txt"`
 
-       f = File.new("#{simapp}/#{$guid}.sb","w")
-       f << "(version 1)\n(debug deny)\n(allow default)\n"
-       f.close
-     end
-     system("open \"#{$sim}/iPhone Simulator.app\"")
+     f = File.new("#{$simapp}/#{$guid}.sb","w")
+     f << "(version 1)\n(debug deny)\n(allow default)\n"
+     f.close
 
+     system("open \"#{$sim}/iPhone Simulator.app\"")

data/platform/shared/common/AppMenu.cpp

@@ -0,0 +1,122 @@
+#include "AppMenu.h"
+#include "common/RhodesApp.h"
+#include "ruby/ext/rho/rhoruby.h"
+#include "rubyext/WebView.h"
+
+extern "C" void rho_sync_doSyncAllSources(int show_status_popup);
+extern "C" void rho_conf_show_log();
+extern "C" void rho_sys_app_exit();
+
+namespace rho {
+namespace common{
+
+IMPLEMENT_LOGCLASS(CAppMenu, "AppMenu");
+
+void CAppMenu::addAppMenuItem( const String& strLabel, const String& strLink )
+{
+    if ( strLabel.length() == 0 )
+        return;
+
+    if ( strcasecmp( strLabel.c_str(), "back" )==0 && strcasecmp( strLink.c_str(), "back" )!=0 )
+        RHODESAPP().setAppBackUrl(strLink);
+    else
+    	m_arAppMenuItems.push_back(CAppMenuItem(strLabel, strLink));
+}
+
+extern "C" void
+menu_iter(const char* szLabel, const char* szLink, void* pThis)
+{
+	((CAppMenu*)pThis)->addAppMenuItem(szLabel, szLink );
+}
+
+void CAppMenu::setAppMenu(unsigned long valMenu)
+{
+    synchronized(m_mxAppMenu) 
+	{
+		m_arAppMenuItems.clear();
+        RHODESAPP().setAppBackUrl("");
+        rho_ruby_enum_strhash(valMenu, menu_iter, this);
+    }
+}
+
+void CAppMenu::copyMenuItems(Vector<CAppMenuItem>& arAppMenuItems)
+{
+    synchronized(m_mxAppMenu) 
+	{
+        arAppMenuItems = m_arAppMenuItems; 
+    }
+}
+
+CAppMenuItem::CAppMenuItem (const String& strLabel, const String& strLink)
+{
+	m_strLabel = strLabel;
+	m_strLink  = strLink;
+	
+	if (strLabel == "separator")
+		m_eType = emtSeparator;
+	else if (strLink == "home")
+		m_eType = emtHome;
+	else if (strLink == "refresh")
+		m_eType = emtRefresh;
+	else if (strLink == "options")
+		m_eType = emtOptions;
+	else if (strLink == "log")
+		m_eType = emtLog;
+	else if (strLink == "sync")
+		m_eType = emtSync;
+	else if (strLink == "close")
+		m_eType = emtClose;
+	else if (strLink == "exit")
+		m_eType = emtExit;
+	else if (strLink == "back")
+		m_eType = emtBack;
+	else if (strLink == "fullscreen")
+		m_eType = emtFullscreen;
+	else
+		m_eType = emtUrl;
+}
+
+boolean CAppMenuItem::processCommand()
+{
+    switch(m_eType)
+    {
+    case CAppMenuItem::emtUrl:
+        rho_rhodesapp_load_url(m_strLink.c_str());
+        break;
+    case CAppMenuItem::emtRefresh:
+        rho_webview_refresh(0);
+        break;
+    case CAppMenuItem::emtSync:
+        rho_sync_doSyncAllSources(1);
+        break;
+    case CAppMenuItem::emtLog:
+        rho_conf_show_log();
+        break;
+    case CAppMenuItem::emtExit:
+    case CAppMenuItem::emtClose:
+        rho_sys_app_exit();
+        break;
+
+    case CAppMenuItem::emtHome:
+        rho_webview_navigate(RHODESAPP().getStartUrl().c_str(), 0);
+        break;
+    case CAppMenuItem::emtBack:
+        RHODESAPP().navigateBack();
+        break;
+    case CAppMenuItem::emtOptions:
+        rho_webview_navigate(RHODESAPP().getOptionsUrl().c_str(), 0);
+        break;
+
+    case CAppMenuItem::emtFullscreen:
+        rho_webview_full_screen_mode(1);
+        break;
+
+    default:
+        return false;
+    }
+
+    return true;
+}
+
+} //namespace common
+} //namespace rho

data/platform/shared/common/AppMenu.h

@@ -0,0 +1,46 @@
+#ifndef __APP_MENU__H__
+#define __APP_MENU__H__
+
+#define APP_MENU_ITEMS_MAX 32 //maximus number of items app menu can contain
+
+#ifdef __cplusplus
+
+#include "logging/RhoLog.h"
+
+namespace rho {
+namespace common {
+
+struct CAppMenuItem 
+{
+    enum EnumMenuType { emtNone = 0, emtSeparator, emtUrl, emtRefresh, emtHome, emtBack, emtSync, emtOptions, emtLog, emtExit,
+        emtClose, emtFullscreen };
+	String m_strLabel;
+	String m_strLink;
+	EnumMenuType  m_eType;
+
+    CAppMenuItem (const String &label, const String &link);
+    boolean processCommand();
+};
+
+class CAppMenu
+{
+	DEFINE_LOGCLASS;
+
+    common::CMutex m_mxAppMenu;
+	Vector<CAppMenuItem> m_arAppMenuItems;
+
+public:
+    void setAppMenu(unsigned long valMenu);
+    void copyMenuItems(Vector<CAppMenuItem>& arAppMenuItems);
+
+//private:
+    void addAppMenuItem( const String& strLabel, const String& strLink );
+
+};
+
+} //namespace common
+} //namespace rho
+
+#endif //__cplusplus
+
+#endif //__WEB_VIEW__H__

data/platform/shared/common/PosixThreadImpl.cpp

@@ -39,7 +39,7 @@ void CPosixThreadImpl::start(IRhoRunnable *pRunnable, IRhoRunnable::EPriority eP
 
     pthread_attr_t  attr;
     int return_val = pthread_attr_init(&attr);
-    return_val = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+    //return_val = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
     RHO_ASSERT(!return_val);
 
     if ( ePriority != IRhoRunnable::epNormal)

data/platform/shared/common/RhoConf.cpp

@@ -2,11 +2,10 @@
 #include "RhoFile.h"
 #include "RhoFilePath.h"
 #include "StringConverter.h"
+#include "ruby/ext/rho/rhoruby.h"
 
 static const char* CONF_FILENAME = "apps/rhoconfig.txt";
 
-extern "C" void rho_conf_set_property_by_name(char* name, char* value);
-
 namespace rho{
 namespace common{
 
@@ -134,6 +133,27 @@ bool   RhoSettings::getBool(const char* szName){
     return getInt(szName) == 0 ? false : true;
 }
 
+void   RhoSettings::setString(const char* szName, const String& str, boolean bSaveToFile){
+    m_mapValues[szName] = str;
+
+    if ( bSaveToFile )
+        saveToFile();
+}
+
+void   RhoSettings::setInt(const char* szName, int nVal, boolean bSaveToFile){
+    m_mapValues[szName] = common::convertToStringA(nVal);
+
+    if ( bSaveToFile )
+        saveToFile();
+}
+
+void   RhoSettings::setBool(const char* szName, bool bVal, boolean bSaveToFile){
+    setInt(szName, bVal?1:0);
+
+    if ( bSaveToFile )
+        saveToFile();
+}
+
 void   RhoSettings::setString(const char* szName, const String& str){
     m_mapValues[szName] = str;
 }
@@ -183,6 +203,11 @@ char* rho_conf_getString(const char* szName) {
 	return strdup(RHOCONF().getString(szName).c_str());
 }
 
+unsigned long rho_conf_is_property_exists(char* name)
+{
+    return rho_ruby_create_boolean(RHOCONF().isExist(name));
+}
+
 void rho_conf_freeString(char* str) {
 	free(str);
 }

data/platform/shared/common/RhoConf.h

@@ -21,6 +21,11 @@ public:
     String getPath(const char* szName);
     int    getInt(const char* szName);
     bool   getBool(const char* szName);
+
+    void   setString(const char* szName, const String& str, boolean bSaveToFile);
+    void   setInt(const char* szName, int nVal, boolean bSaveToFile);
+    void   setBool(const char* szName, bool bVal, boolean bSaveToFile);
+
     void   setString(const char* szName, const String& str);
     void   setInt(const char* szName, int nVal);
     void   setBool(const char* szName, bool bVal);

data/platform/shared/common/RhoFilePath.h

@@ -29,6 +29,11 @@ public:
         return res;
     }
 
+    String changeBaseName( const String& strFileName )
+    {
+        return changeBaseName(strFileName.c_str());
+    }
+
     String changeBaseName( const char* szFileName )
     {
         const char* base = findLastSlash();
@@ -69,6 +74,22 @@ public:
         return path;
     }
 
+    static boolean isEqualBaseNames(const String& path1, const String& path2)
+    {
+        CFilePath oPath1(path1);
+        CFilePath oPath2(path2);
+
+        return strcasecmp(oPath1.getBaseName(), oPath2.getBaseName()) == 0;
+    }
+
+    static String getRelativePath( const String& path1, const String& path2)
+    {
+        if ( !String_startsWith(path1, path2) )
+            return path1;
+
+        return path1.substr(path2.length());
+    }
+
 private:
 
     const char* findLastSlash(){

data/platform/shared/common/RhoStd.h

@@ -26,7 +26,7 @@ typedef bool boolean;
 
 #define null 0
 
-inline String trimRight(const String& str)
+inline String String_trimRight(const String& str)
 {
     // trim trailing spaces
     size_t endpos = str.find_last_not_of(" \t");
@@ -36,7 +36,7 @@ inline String trimRight(const String& str)
     return str;
 }
 
-inline String trimLeft(const String& str)
+inline String String_trimLeft(const String& str)
 {
     size_t startpos = str.find_first_not_of(" \t");
     if( String::npos != startpos )
@@ -45,10 +45,33 @@ inline String trimLeft(const String& str)
     return str;
 }
 
-inline String trim(const String& str)
+inline String String_trim(const String& str)
 {
-    String strRes = trimLeft(str);
-    return trimRight(strRes);
+    String strRes = String_trimLeft(str);
+    return String_trimRight(strRes);
+}
+
+inline boolean String_endsWith(const String& str, const char* szSuffix)
+{
+    if ( !szSuffix || !*szSuffix )
+        return false;
+
+    int nOff = str.length() - strlen(szSuffix);
+    if ( nOff < 0 )
+        return false;
+
+    return strcmp(str.c_str()+nOff, szSuffix) == 0;
+}
+
+inline boolean String_startsWith(const String& str, const String& strPrefix)
+{
+    if ( strPrefix.length() == 0 )
+        return false;
+
+    if ( str.length() < strPrefix.length() )
+        return false;
+
+    return strncmp(str.c_str(), strPrefix.c_str(), strPrefix.length()) == 0;
 }
 
 template<class Type>
@@ -83,6 +106,22 @@ public:
         }
     }
 
+    int indexOf(const Type& item)
+    {
+        for (int i = 0; i < (int)std::vector<Type>::size(); i++)
+        {
+            if ( std::vector<Type>::at(i) == item )
+                return i;
+        }
+
+        return -1;
+    }
+
+    void removeAllElements()
+    {
+        Vector<Type>::clear();
+    }
+
     typename std::vector<Type>::reference elementAt(typename std::vector<Type>::size_type i){ return at(i);}
     typename std::vector<Type>::const_reference elementAt(typename std::vector<Type>::size_type i) const{ return at(i); }
 };