3cf2d117e5
Added two new methods to the Locale Kit in order to create a custom time formats from a format string. One method is outputs into a char* array, the other into a BString() and you can set the timezone. These methods should be cleaned up, we only need 2, one to get the time in a predefined style, the other to get a custom time format. Also should probably do the same for dates and datetimes. But I'll let this go for now. I added myself to the Locale.cpp file. I retained the copyright instead of assigning it to Haiku, Inc. because the file is under the OpenBeOS license and I don't know what the concequences of copyright sharing are for that license, unlike MIT. These new methods are used to generate custom time formats in Deskbar. Instead of using a set of Radio Buttons to choose between the predefined time options I build my own by creating a format string and passing it to the Locale Kit. The format string is generated from 3 checkboxes, show seconds, show day of week, and show time zone. You can mix and match between them choose any that you like. By default they are all off. There are 3 new deskbar settings associated with these new options: showSeconds, showDayOfWeek, and showTimeZone. timeFormat has gone away. The time format string gets cached and updated only when Update() gets called on the TimeView class. In order to fit all the options in (there is 1 more than before) I had to reduce the font size of the clock to 11pt when all options are turned on in 12 hour mode. For those with no imagination it looks like this: http://imagebin.org/208162 Renamed "Open time preferences..." menuitem to "Time preferences...". Renamed "Show Time" and "Hide Time" to "Show time" and "Hide time". Other changes include refactoring the header files a bit. There were a lot of headers included by header files uneccessarily. For instance BarWindow.h now only includes <Window.h> and <Deskbar.h>. This change is mainly to to speed up the compile time since it takes a while right now. I copy the fBarView pointer from BarWindow in the BarApp constructor and then use that throughout the file rather than getting the pointer from the window each time by calling BarView(). BarView() is still available in the header for other classes though. I moved some message constants around since it was getting a bit jumbled. Most of the messages related to settings are in PreferenceWindow.h. fChangeState is moved to BarView.h since that is where the ChangeState() function is and BarView.cpp uses that constant. The time interval and format constants are in TimeView.h. Make some methods public in their respective classes where it made sense. The preference window methods to update dependent items are public, that might get called from BarWindow when a message gets received at some point. Also made ShowHideTime() and Time() public in StatusView.h. These methods activate showing and hiding the clock and return the fTime clock object. No reason they should be private. I reindented the StatusView.h and PreferenceWindow.h headers to the standard style. Question here, are the public: protected: and private: lines inside of classes suppose to get indented 1 tab or not? I've seen both, the style guide says no indent but 1 indent seems reasonable and looks pretty good. Style fixes here and there. That's enough for one commit I think.
202 lines
5.3 KiB
C++
202 lines
5.3 KiB
C++
/*
|
|
* Copyright 2003-2012, Haiku, Inc.
|
|
* Distributed under the terms of the MIT License.
|
|
*/
|
|
#ifndef _B_LOCALE_H_
|
|
#define _B_LOCALE_H_
|
|
|
|
|
|
#include <Collator.h>
|
|
#include <FormattingConventions.h>
|
|
#include <Language.h>
|
|
#include <Locker.h>
|
|
|
|
|
|
namespace icu {
|
|
class DateFormat;
|
|
}
|
|
|
|
|
|
class BCatalog;
|
|
class BString;
|
|
class BTimeZone;
|
|
|
|
|
|
enum BDateElement {
|
|
B_DATE_ELEMENT_INVALID = B_BAD_DATA,
|
|
B_DATE_ELEMENT_YEAR = 0,
|
|
B_DATE_ELEMENT_MONTH,
|
|
B_DATE_ELEMENT_DAY,
|
|
B_DATE_ELEMENT_AM_PM,
|
|
B_DATE_ELEMENT_HOUR,
|
|
B_DATE_ELEMENT_MINUTE,
|
|
B_DATE_ELEMENT_SECOND
|
|
};
|
|
|
|
enum BNumberElement {
|
|
B_NUMBER_ELEMENT_INVALID = B_BAD_DATA,
|
|
B_NUMBER_ELEMENT_INTEGER = 0,
|
|
B_NUMBER_ELEMENT_FRACTIONAL,
|
|
B_NUMBER_ELEMENT_CURRENCY
|
|
};
|
|
|
|
|
|
// TODO: move this to BCalendar (should we ever have that) or BDate
|
|
enum BWeekday {
|
|
B_WEEKDAY_MONDAY = 1,
|
|
B_WEEKDAY_TUESDAY,
|
|
B_WEEKDAY_WEDNESDAY,
|
|
B_WEEKDAY_THURSDAY,
|
|
B_WEEKDAY_FRIDAY,
|
|
B_WEEKDAY_SATURDAY,
|
|
B_WEEKDAY_SUNDAY,
|
|
};
|
|
|
|
|
|
class BLocale {
|
|
public:
|
|
BLocale(const BLanguage* language = NULL,
|
|
const BFormattingConventions* conventions
|
|
= NULL);
|
|
BLocale(const BLocale& other);
|
|
~BLocale();
|
|
|
|
static const BLocale* Default();
|
|
|
|
BLocale& operator=(const BLocale& other);
|
|
|
|
status_t GetCollator(BCollator* collator) const;
|
|
status_t GetLanguage(BLanguage* language) const;
|
|
status_t GetFormattingConventions(
|
|
BFormattingConventions* conventions) const;
|
|
|
|
void SetFormattingConventions(
|
|
const BFormattingConventions& conventions);
|
|
void SetCollator(const BCollator& newCollator);
|
|
void SetLanguage(const BLanguage& newLanguage);
|
|
|
|
// see definitions in LocaleStrings.h
|
|
const char* GetString(uint32 id) const;
|
|
|
|
void FormatString(char* target, size_t maxSize,
|
|
char* fmt, ...) const;
|
|
void FormatString(BString* buffer, char* fmt,
|
|
...) const;
|
|
|
|
// DateTime
|
|
|
|
// TODO: drop some of these once BDateTimeFormat
|
|
// has been implemented!
|
|
ssize_t FormatDateTime(char* target, size_t maxSize,
|
|
time_t time, BDateFormatStyle dateStyle,
|
|
BTimeFormatStyle timeStyle) const;
|
|
status_t FormatDateTime(BString* buffer, time_t time,
|
|
BDateFormatStyle dateStyle,
|
|
BTimeFormatStyle timeStyle,
|
|
const BTimeZone* timeZone = NULL) const;
|
|
|
|
// Date
|
|
|
|
// TODO: drop some of these once BDateFormat
|
|
// has been implemented!
|
|
ssize_t FormatDate(char* string, size_t maxSize,
|
|
time_t time, BDateFormatStyle style) const;
|
|
status_t FormatDate(BString* string, time_t time,
|
|
BDateFormatStyle style,
|
|
const BTimeZone* timeZone = NULL) const;
|
|
status_t FormatDate(BString* string,
|
|
int*& fieldPositions, int& fieldCount,
|
|
time_t time, BDateFormatStyle style) const;
|
|
status_t GetDateFields(BDateElement*& fields,
|
|
int& fieldCount, BDateFormatStyle style
|
|
) const;
|
|
|
|
status_t GetStartOfWeek(BWeekday* weekday) const;
|
|
|
|
// Time
|
|
|
|
// TODO: drop some of these once BTimeFormat
|
|
// has been implemented!
|
|
ssize_t FormatTime(char* string, size_t maxSize,
|
|
time_t time, BTimeFormatStyle style) const;
|
|
ssize_t FormatTime(char* string, size_t maxSize,
|
|
time_t time, BString format) const;
|
|
status_t FormatTime(BString* string, time_t time,
|
|
BTimeFormatStyle style,
|
|
const BTimeZone* timeZone = NULL) const;
|
|
status_t FormatTime(BString* string, time_t time,
|
|
BString format,
|
|
const BTimeZone* timeZone) const;
|
|
status_t FormatTime(BString* string,
|
|
int*& fieldPositions, int& fieldCount,
|
|
time_t time, BTimeFormatStyle style) const;
|
|
status_t GetTimeFields(BDateElement*& fields,
|
|
int& fieldCount, BTimeFormatStyle style
|
|
) const;
|
|
|
|
// numbers
|
|
|
|
ssize_t FormatNumber(char* string, size_t maxSize,
|
|
double value) const;
|
|
status_t FormatNumber(BString* string,
|
|
double value) const;
|
|
ssize_t FormatNumber(char* string, size_t maxSize,
|
|
int32 value) const;
|
|
status_t FormatNumber(BString* string,
|
|
int32 value) const;
|
|
|
|
// monetary
|
|
|
|
ssize_t FormatMonetary(char* string, size_t maxSize,
|
|
double value) const;
|
|
status_t FormatMonetary(BString* string,
|
|
double value) const;
|
|
|
|
// Collator short-hands
|
|
int StringCompare(const char* s1,
|
|
const char* s2) const;
|
|
int StringCompare(const BString* s1,
|
|
const BString* s2) const;
|
|
|
|
void GetSortKey(const char* string,
|
|
BString* sortKey) const;
|
|
|
|
private:
|
|
icu::DateFormat* _CreateDateFormatter(
|
|
const BString& format) const;
|
|
icu::DateFormat* _CreateTimeFormatter(
|
|
const BString& format) const;
|
|
|
|
mutable BLocker fLock;
|
|
BCollator fCollator;
|
|
BFormattingConventions fConventions;
|
|
BLanguage fLanguage;
|
|
};
|
|
|
|
|
|
//--- collator short-hands inlines ---
|
|
// #pragma mark -
|
|
|
|
inline int
|
|
BLocale::StringCompare(const char* s1, const char* s2) const
|
|
{
|
|
return fCollator.Compare(s1, s2);
|
|
}
|
|
|
|
|
|
inline int
|
|
BLocale::StringCompare(const BString* s1, const BString* s2) const
|
|
{
|
|
return fCollator.Compare(s1->String(), s2->String());
|
|
}
|
|
|
|
|
|
inline void
|
|
BLocale::GetSortKey(const char* string, BString* sortKey) const
|
|
{
|
|
fCollator.GetSortKey(string, sortKey);
|
|
}
|
|
|
|
|
|
#endif /* _B_LOCALE_H_ */
|