Ticket #7726: 0001-Create-TimeZoneListView-class-and-move-GetToolTipAt-.patch

src/preferences/time/Jamfile

@@ -18 +18 @@
     TimeSettings.cpp
     TimeWindow.cpp
     TimeZoneListItem.cpp
+    TimeZoneListView.cpp
     TZDisplay.cpp
     ZoneView.cpp
     ;
@@ -42 +43 @@
     ntp.cpp
     Time.cpp
     TimeWindow.cpp
+    TimeZoneListView.cpp
     ZoneView.cpp
     ;

new file src/preferences/time/TimeZoneListView.cpp

@@ +1 @@
+/*
+ * Copyright 2012, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *      Sean Bailey <ziusudra@gmail.com>
+*/
+
+
+#include "TimeZoneListView.h"
+
+#include <new>
+
+#include <Catalog.h>
+#include <Locale.h>
+#include <String.h>
+#include <TimeZone.h>
+#include <ToolTip.h>
+
+#include "TimeZoneListItem.h"
+
+
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Time"
+
+
+TimeZoneListView::TimeZoneListView(void)
+    :
+    BOutlineListView("cityList", B_SINGLE_SELECTION_LIST),
+    fToolTip(NULL)
+{
+}
+
+
+TimeZoneListView::~TimeZoneListView()
+{
+    if (fToolTip != NULL)
+        fToolTip->ReleaseReference();
+}
+
+
+bool
+TimeZoneListView::GetToolTipAt(BPoint point, BToolTip** _tip)
+{
+    TimeZoneListItem* item = static_cast<TimeZoneListItem*>(
+        this->ItemAt(this->IndexOf(point)));
+    if (item == NULL || !item->HasTimeZone())
+        return false;
+
+    BString nowInTimeZone;
+    time_t now = time(NULL);
+    BLocale::Default()->FormatTime(&nowInTimeZone, now, B_SHORT_TIME_FORMAT,
+        &item->TimeZone());
+
+    BString dateInTimeZone;
+    BLocale::Default()->FormatDate(&dateInTimeZone, now, B_SHORT_DATE_FORMAT,
+        &item->TimeZone());
+
+    BString toolTip = item->Text();
+    toolTip << '\n' << item->TimeZone().ShortName() << " / "
+            << item->TimeZone().ShortDaylightSavingName()
+            << B_TRANSLATE("\nNow: ") << nowInTimeZone
+            << " (" << dateInTimeZone << ')';
+
+    if (fToolTip != NULL)
+        fToolTip->ReleaseReference();
+    fToolTip = new (std::nothrow) BTextToolTip(toolTip.String());
+    if (fToolTip == NULL)
+        return false;
+
+    *_tip = fToolTip;
+
+    return true;
+}

new file src/preferences/time/TimeZoneListView.h

@@ +1 @@
+/*
+ * Copyright 2012, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *      Sean Bailey <ziusudra@gmail.com>
+ */
+#ifndef _TIME_ZONE_LIST_VIEW_H
+#define _TIME_ZONE_LIST_VIEW_H
+
+
+#include <OutlineListView.h>
+
+
+class BTextToolTip;
+
+
+class TimeZoneListView : public BOutlineListView {
+public:
+                                TimeZoneListView(void);
+                                ~TimeZoneListView();
+
+protected:
+    virtual bool                GetToolTipAt(BPoint point, BToolTip** _tip);
+
+private:
+            BTextToolTip*       fToolTip;
+};
+
+
+#endif  // _TIME_ZONE_LIST_VIEW_H

src/preferences/time/ZoneView.cpp

@@ -1 +1 @@
 /*
- * Copyright 2004-2010, Haiku, Inc. All Rights Reserved.
+ * Copyright 2004-2012, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -42 +42 @@
 #include <String.h>
 #include <StringView.h>
 #include <TimeZone.h>
-#include <ToolTip.h>
 #include <View.h>
 #include <Window.h>
 
@@ -52 +51 @@
 
 #include "TimeMessages.h"
 #include "TimeZoneListItem.h"
+#include "TimeZoneListView.h"
 #include "TZDisplay.h"
 
 
@@ -84 +84 @@
     :
     BGroupView(name, B_HORIZONTAL, B_USE_DEFAULT_SPACING),
     fGmtTime(NULL),
-    fToolTip(NULL),
     fUseGmtTime(false),
     fCurrentZoneItem(NULL),
     fOldZoneItem(NULL),
@@ -107 +106 @@
 
 TimeZoneView::~TimeZoneView()
 {
-    if (fToolTip != NULL)
-        fToolTip->ReleaseReference();
     _WriteRTCSettings();
 }
 
@@ -189 +186 @@
 }
 
 
-bool
-TimeZoneView::GetToolTipAt(BPoint point, BToolTip** _tip)
-{
-    TimeZoneListItem* item = static_cast<TimeZoneListItem*>(
-        fZoneList->ItemAt(fZoneList->IndexOf(point)));
-    if (item == NULL || !item->HasTimeZone())
-        return false;
-
-    BString nowInTimeZone;
-    time_t now = time(NULL);
-    BLocale::Default()->FormatTime(&nowInTimeZone, now, B_SHORT_TIME_FORMAT,
-        &item->TimeZone());
-
-    BString dateInTimeZone;
-    BLocale::Default()->FormatDate(&dateInTimeZone, now, B_SHORT_DATE_FORMAT,
-        &item->TimeZone());
-
-    BString toolTip = item->Text();
-    toolTip << '\n' << item->TimeZone().ShortName() << " / "
-            << item->TimeZone().ShortDaylightSavingName()
-            << B_TRANSLATE("\nNow: ") << nowInTimeZone
-            << " (" << dateInTimeZone << ')';
-
-    if (fToolTip != NULL)
-        fToolTip->ReleaseReference();
-    fToolTip = new (std::nothrow) BTextToolTip(toolTip.String());
-    if (fToolTip == NULL)
-        return false;
-
-    *_tip = fToolTip;
-
-    return true;
-}
-
-
 void
 TimeZoneView::_UpdateDateTime(BMessage* message)
 {
@@ -243 +205 @@
 void
 TimeZoneView::_InitView()
 {
-    fZoneList = new BOutlineListView("cityList", B_SINGLE_SELECTION_LIST);
+    fZoneList = new TimeZoneListView();
     fZoneList->SetSelectionMessage(new BMessage(H_CITY_CHANGED));
     fZoneList->SetInvocationMessage(new BMessage(H_SET_TIME_ZONE));
     _BuildZoneMenu();

src/preferences/time/ZoneView.h

@@ -1 +1 @@
 /*
- * Copyright 2004-2011, Haiku, Inc. All Rights Reserved.
+ * Copyright 2004-2012, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -20 +20 @@
 class BOutlineListView;
 class BPopUpMenu;
 class BRadioButton;
-class BTextToolTip;
 class BTimeZone;
 class TimeZoneListItem;
+class TimeZoneListView;
 class TTZDisplay;
 
 
@@ -36 +36 @@
             bool                CheckCanRevert();
 
 protected:
-    virtual bool                GetToolTipAt(BPoint point, BToolTip** _tip);
     virtual void                DoLayout();
 
 private:
@@ -58 +57 @@
 
             void                _Revert();
 
-            BOutlineListView*   fZoneList;
+            TimeZoneListView*   fZoneList;
             BButton*            fSetZone;
             TTZDisplay*         fCurrent;
             TTZDisplay*         fPreview;
             BRadioButton*       fLocalTime;
             BRadioButton*       fGmtTime;
 
-            BTextToolTip*       fToolTip;
-
             int32               fLastUpdateMinute;
             bool                fUseGmtTime;
             bool                fOldUseGmtTime;