rhodes 2.4.1.beta.1 → 2.4.1

data/platform/wm/rhodes/DateTimePicker.cpp

@@ -41,8 +41,16 @@ CDateTimePickerDialog::~CDateTimePickerDialog ()
 
 LRESULT CDateTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 {
-	SetWindowText(_T("Date"));
-
+	if ((m_title != NULL) && (strlen(m_title) > 0)) {
+		String title = m_title;
+		StringW title_w = convertToStringW(title);
+		//SetWindowText(title_w.c_str());
+		SetDlgItemText(ID_DATETIME_CAPTION, title_w.c_str());
+		//GetDlgItem(ID_DATETIME_CAPTION).SetWindowText(title_w.c_str());
+	}
+	else {
+		SetWindowText(_T("Date"));
+	}
 #if defined(_WIN32_WCE)
 
     SHINITDLGINFO shidi = { SHIDIM_FLAGS, m_hWnd, SHIDIF_SIZEDLGFULLSCREEN };
@@ -69,6 +77,12 @@ LRESULT CDateTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LP
 	}
 	DateTime_SetRange( GetDlgItem(IDC_DATE_CTRL), flags, times);
 
+	SYSTEMTIME start_time;
+	if (m_initialTime != 0) {
+		UnixTimeToSystemTime(m_initialTime, &start_time);
+		DateTime_SetSystemtime( GetDlgItem(IDC_DATE_CTRL), GDT_VALID, &start_time);
+		DateTime_SetSystemtime( GetDlgItem(IDC_TIME_CTRL), GDT_VALID, &start_time);
+	}
 
 	GotoDlgCtrl(GetDlgItem(IDC_DATE_CTRL));
 
@@ -81,6 +95,8 @@ LRESULT CDateTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LP
 
 	DLG_ITEM_SET_FONT_BOLD (IDC_DATE_STATIC);
 	DLG_ITEM_SET_FONT_BOLD (IDC_TIME_STATIC);
+	DLG_ITEM_SET_FONT_BOLD (ID_DATETIME_CAPTION);
+	
 
 	if (m_format == CDateTimeMessage::FORMAT_DATE) {
 		GetDlgItem(IDC_TIME_CTRL).ShowWindow(SW_HIDE);
@@ -155,7 +171,16 @@ CTimePickerDialog::~CTimePickerDialog ()
 
 LRESULT CTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 {
-	SetWindowText(_T("Date"));
+	if ((m_title != NULL) && (strlen(m_title) > 0)) {
+		String title = m_title;
+		StringW title_w = convertToStringW(title);
+		//SetWindowText(title_w.c_str());
+		//GetDlgItem(IDC_TIME_CTRL).SetWindowText(title_w.c_str());
+		SetDlgItemText(ID_TIME_CAPTION, title_w.c_str());
+	}
+	else {
+		SetWindowText(_T("Date"));
+	}
 
 #if defined(_WIN32_WCE)
 
@@ -169,6 +194,12 @@ LRESULT CTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM
     RHO_ASSERT(SHCreateMenuBar(&mbi));
 	GotoDlgCtrl(GetDlgItem(IDC_TIME_CTRL));
 
+	SYSTEMTIME start_time;
+	if (m_initialTime != 0) {
+		UnixTimeToSystemTime(m_initialTime, &start_time);
+		DateTime_SetSystemtime( GetDlgItem(IDC_TIME_CTRL), GDT_VALID, &start_time);
+	}
+
 #else
 
 	CreateButtons();
@@ -177,6 +208,7 @@ LRESULT CTimePickerDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM
 #endif
 
 	DLG_ITEM_SET_FONT_BOLD (IDC_TIME_STATIC);
+	DLG_ITEM_SET_FONT_BOLD (ID_TIME_CAPTION);
 
     return FALSE;
 }
@@ -203,15 +235,24 @@ LRESULT CTimePickerDialog::OnCancel(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndC
 }
 
 
+static char ourTitle[1024];
+
 void  choose_datetime_with_range(char* callback, char* title, 
 					  long initial_time, int format, char* data,
 					  long min_time, long max_time)
 {
 	LOG(INFO) + __FUNCTION__ + "callback = " + callback + " title = " + title;
 
+	if (title != NULL) {
+		strcpy(ourTitle, title);
+	}
+	else {
+		strcpy(ourTitle, "");
+	}
+
 	HWND main_wnd = getMainWnd();
 	::PostMessage(main_wnd, WM_DATETIME_PICKER, 0, 
-					(LPARAM)new CDateTimeMessage(callback, title, initial_time, format, data, min_time, max_time));
+					(LPARAM)new CDateTimeMessage(callback, ourTitle, initial_time, format, data, min_time, max_time));
 }
 
 

data/platform/wm/rhodes/Rhodes.rc

@@ -193,22 +193,25 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,97,87,50,14
 END
 
-IDD_DATETIME_PICKER DIALOG  0, 0, 172, 186
-STYLE DS_SETFONT | WS_POPUP | WS_SYSMENU
+IDD_DATETIME_PICKER DIALOGEX 0, 0, 172, 186
+STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "DateTime Picker"
 FONT 8, "Microsoft Sans Serif"
 BEGIN
-    CONTROL         "",IDC_TIME_CTRL,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP | 0x8,7,36,143,15
-    CONTROL         "",IDC_DATE_CTRL,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,7,11,143,15
-    LTEXT           "Time:",IDC_TIME_STATIC,7,26,25,10
-    LTEXT           "Date:",IDC_DATE_STATIC,7,3,27,8
+    CONTROL         "",IDC_TIME_CTRL,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP | 0x8,7,54,143,15
+    CONTROL         "",IDC_DATE_CTRL,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,7,29,143,15
+    LTEXT           "Time:",IDC_TIME_STATIC,7,44,25,10
+    LTEXT           "Date:",IDC_DATE_STATIC,7,21,27,8
+    LTEXT           "DateTime Picker",ID_DATETIME_CAPTION,9,6,141,8
 END
 
-IDD_TIME_PICKER DIALOG  0, 0, 172, 186
+IDD_TIME_PICKER DIALOGEX 0, 0, 172, 186
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "",IDC_TIME_CTRL,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP | 0x8,7,11,143,15
-    LTEXT           "Time:",IDC_TIME_STATIC,7,3,27,8
+    CONTROL         "",IDC_TIME_CTRL,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP | 0x8,7,29,143,15
+    LTEXT           "Time:",IDC_TIME_STATIC,7,21,27,8
+    LTEXT           "Time Picker",ID_TIME_CAPTION,9,6,142,8
 END
 
 IDD_BLUETOOTH_DISCOVER DIALOG  0, 0, 172, 186

data/platform/wm/rhodes/resource.h

@@ -35,6 +35,7 @@
 #define IDC_EDIT1                       1006
 #define IDC_MSGCLASSES                  1006
 #define IDC_EDIT2                       1007
+#define ID_DATETIME_CAPTION             1007
 #define IDC_MSGEXCLUDE                  1008
 #define IDC_SYNCSTATUS                  1009
 #define IDC_BUTTON2                     1010
@@ -46,6 +47,7 @@
 #define IDC_BT_LIST                     1020
 #define IDC_SLIDER1                     1020
 #define IDC_SLIDER_ZOOM                 1020
+#define ID_TIME_CAPTION                 1021
 #define IDC_BUTTON1                     1022
 #define IDC_BT_CANCEL                   1022
 #define IDC_BT_STATIC                   1023
@@ -87,7 +89,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        125
 #define _APS_NEXT_COMMAND_VALUE         40031
-#define _APS_NEXT_CONTROL_VALUE         1021
+#define _APS_NEXT_CONTROL_VALUE         1022
 #define _APS_NEXT_SYMED_VALUE           111
 #endif
 #endif

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = "2.4.1.beta.1"
+  s.version = Rhodes::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196393
-  prerelease: 6
+  hash: 29
+  prerelease: 
   segments: 
   - 2
   - 4
   - 1
-  - beta
-  - 1
-  version: 2.4.1.beta.1
+  version: 2.4.1
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 Z
+date: 2011-04-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: templater