Ticket #2170: timepref.diff

src/preferences/time/TimeWindow.cpp

@@ -42 +42 @@
 {
     switch(message->what) {
         case H_USER_CHANGE:
+        {
             fBaseView->ChangeTime(message);
-            break;
+            BMessage msg(*message);
+            msg.what = kMsgEnableRevert;
+            fDateTimeView->MessageReceived(&msg);
+        } break;
         
         case B_ABOUT_REQUESTED:
             be_app->PostMessage(B_ABOUT_REQUESTED);

src/preferences/time/DateTimeView.cpp

@@ -6 +6 @@
  *      Andrew McCall <mccall@@digitalparadise.co.uk>
  *      Mike Berg <mike@berg-net.us>
  *      Julun <host.haiku@gmx.de>
+ *      Philippe Saint-Pierre <stpere@gmail.com>
  */
 
 #include "DateTimeView.h"
@@ -13 +14 @@
 #include "CalendarView.h"
 #include "DateTimeEdit.h"
 #include "TimeMessages.h"
+#include "DateTime.h"
 
 
+#include <Button.h>
 #include <CheckBox.h>
 #include <Entry.h>
 #include <File.h>
@@ -25 +28 @@
 #include <String.h>
 #include <StringView.h>
 #include <Window.h>
+#include <time.h>
 
 
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
@@ -39 +43 @@
     : BView(frame, "dateTimeView", B_FOLLOW_NONE, B_WILL_DRAW | B_NAVIGABLE_JUMP),
       fGmtTime(NULL),
       fUseGmtTime(false),
-      fInitialized(false)
+      fInitialized(false),
+      fLastSecond(-1),
+      fUptime(0)
 {
     _ReadRTCSettings();
     _InitView();
+
+    // record the current time to enable revert.
+    time(&fTimeAtStart);
 }
 
 
@@ -63 +72 @@
 
         fGmtTime->SetTarget(this);
         fLocalTime->SetTarget(this);
-        fCalendarView->SetTarget(this);     
+        fCalendarView->SetTarget(this);
+        fRevertButton->SetTarget(this);
     }
 }
 
@@ -119 +129 @@
         }   break;
 
         case kRTCUpdate:
-            fUseGmtTime = !fUseGmtTime;
+            fUseGmtTime = fGmtTime->Value() == B_CONTROL_ON;
             _UpdateGmtSettings();
+            fRevertButton->SetEnabled(true);
             break;
 
+        case kMsgRevert:
+            _Revert();
+            fRevertButton->SetEnabled(false);
+            break;
+    
+        case kMsgEnableRevert:
+            fRevertButton->SetEnabled(true);
+            break;
+
         default:
             BView::MessageReceived(message);
             break;
@@ -131 +151 @@
 
 
 void
+DateTimeView::_Revert()
+{
+    /*  Set the clock and calendar as they were at launch time + 
+            time ellapsed since application launch. */
+    struct tm result;
+    struct tm *timeinfo;
+
+    fUseGmtTime = fOldUseGmtTime;
+    _UpdateGmtSettings();
+
+    if (fUseGmtTime) {
+        fGmtTime->SetValue(B_CONTROL_ON);
+    } else {
+        fLocalTime->SetValue(B_CONTROL_ON);
+    }
+
+    time_t timeNow = fTimeAtStart + (time_t)fUptime;
+    timeinfo = localtime_r(&timeNow, &result);
+
+    BDateTime dateTime = BDateTime::CurrentDateTime(B_LOCAL_TIME);
+    BTime time = dateTime.Time();
+    BDate date = dateTime.Date();
+    int32 sec = timeinfo->tm_sec;
+    time.SetTime(timeinfo->tm_hour, timeinfo->tm_min, (sec > 59) ? 59 : sec);
+    date.SetDate(timeinfo->tm_year + 1900, timeinfo->tm_mon + 1, timeinfo->tm_mday); 
+    dateTime.SetTime(time);
+    dateTime.SetDate(date);
+    
+    set_real_time_clock(dateTime.Time_t());
+}
+
+
+void
 DateTimeView::_InitView()
 {
     font_height fontHeight;
@@ -192 +245 @@
     else
         fLocalTime->SetValue(B_CONTROL_ON);
 
+    fOldUseGmtTime = fUseGmtTime;
+
+    BRect rect = Bounds();
+
+    rect.left = 10;
+    rect.top = rect.bottom - 10;
+
+    fRevertButton = new BButton(rect, "revert", "Revert",
+                            new BMessage(kMsgRevert), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM, B_WILL_DRAW);
+    
+    fRevertButton->ResizeToPreferred();
+    fRevertButton->SetEnabled(false);
+    float buttonHeight = fRevertButton->Bounds().Height();
+    fRevertButton->MoveBy(0, -buttonHeight);
+    AddChild(fRevertButton);
+
     ResizeTo(fClock->Frame().right + 10.0, fGmtTime->Frame().bottom + 10.0);
 }
 
@@ -281 +350 @@
         && message->FindInt32("minute", &minute) == B_OK
         && message->FindInt32("second", &second) == B_OK)
     {
+        if (second != fLastSecond) {
+            fUptime++;
+            fLastSecond = second;
+        }
         fClock->SetTime(hour, minute, second);
         fTimeEdit->SetTime(hour, minute, second);
     }

src/preferences/time/TimeMessages.h

@@ -6 +6 @@
  *      Andrew McCall, mccall@digitalparadise.co.uk
  *      Mike Berg <mike@berg-net.us>
  *      Julun <host.haiku@gmx.de>
+ *      Philippe Saint-Pierre <stpere@gmail.com>
  */
 #ifndef TIME_MESSAGES_H
 #define TIME_MESSAGES_H
@@ -40 +41 @@
 // clicked on day in calendar
 const uint32 kDayChanged = '_kdc';
 
+// clicked on revert button
+const uint32 kMsgRevert = 'rvrt';
+
+const uint32 kMsgEnableRevert = 'ervr';
+
 #endif //TIME_MESSAGES_H
 

src/preferences/time/DateTimeView.h

@@ -6 +6 @@
  *      Andrew McCall <mccall@@digitalparadise.co.uk>
  *      Mike Berg <mike@berg-net.us>
  *      Julun <host.haiku@gmx.de>
+ *      Philippe Saint-Pierre <stpere@gmail.com>
  */
 #ifndef DATE_TIME_VIEW_H
 #define DATE_TIME_VIEW_H
@@ -19 +20 @@
 class BCalendarView;
 class BRadioButton;
 class TAnalogClock;
+class BButton;
 
 
 class DateTimeView : public BView {
@@ -36 +38 @@
         void            _WriteRTCSettings();
         void            _UpdateGmtSettings();
         void            _UpdateDateTime(BMessage *message);
+        void            _Revert();
 
     private:
         BRadioButton    *fLocalTime;
@@ -45 +48 @@
         BCalendarView   *fCalendarView;
         TAnalogClock    *fClock;
 
+        BButton         *fRevertButton;
+
         bool            fUseGmtTime;
+        bool            fOldUseGmtTime;
         bool            fInitialized;
+
+        uint32      fUptime;
+
+        // store the last second we had in memory, to avoid overincreasing uptime..
+        int32           fLastSecond;
+
+        time_t      fTimeAtStart;
 };
 
 #endif  // DATE_TIME_VIEW_H