diff options
Diffstat (limited to 'src/ClockTool.cc')
-rw-r--r-- | src/ClockTool.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/ClockTool.cc b/src/ClockTool.cc index 893d32b..6192c5c 100644 --- a/src/ClockTool.cc +++ b/src/ClockTool.cc | |||
@@ -47,11 +47,13 @@ const char SWITCHES_SECONDS[] = "crsSTX+"; | |||
47 | const char SWITCHES_12_24H[] = "lIrkHT"; | 47 | const char SWITCHES_12_24H[] = "lIrkHT"; |
48 | const char SWITCHES_24_12H[] = "kHTlIr"; | 48 | const char SWITCHES_24_12H[] = "kHTlIr"; |
49 | const char SWITCH_AM_PM[] = "pP"; | 49 | const char SWITCH_AM_PM[] = "pP"; |
50 | const char IGNORE_AFTER_TRIGGER[] = "0123456789"; | ||
50 | 51 | ||
51 | int showSeconds(const std::string& fmt) { | 52 | int showSeconds(const std::string& fmt) { |
52 | 53 | ||
53 | return FbTk::StringUtil::findCharFromAlphabetAfterTrigger( | 54 | return FbTk::StringUtil::findCharFromAlphabetAfterTrigger( |
54 | fmt, '%', SWITCHES_SECONDS, sizeof(SWITCHES_SECONDS), 0) != std::string::npos; | 55 | fmt, '%', SWITCHES_SECONDS, sizeof(SWITCHES_SECONDS), 0, |
56 | IGNORE_AFTER_TRIGGER, sizeof(IGNORE_AFTER_TRIGGER)) != std::string::npos; | ||
55 | } | 57 | } |
56 | 58 | ||
57 | uint64_t calcNextTimeout(const std::string& fmt) { | 59 | uint64_t calcNextTimeout(const std::string& fmt) { |
@@ -82,7 +84,8 @@ public: | |||
82 | // does the current format string contain something with 24/12h? | 84 | // does the current format string contain something with 24/12h? |
83 | size_t found; | 85 | size_t found; |
84 | size_t pos = FbTk::StringUtil::findCharFromAlphabetAfterTrigger( | 86 | size_t pos = FbTk::StringUtil::findCharFromAlphabetAfterTrigger( |
85 | m_tool.timeFormat(), '%', SWITCHES_24_12H, sizeof(SWITCHES_24_12H), &found); | 87 | m_tool.timeFormat(), '%', SWITCHES_24_12H, sizeof(SWITCHES_24_12H), &found, |
88 | IGNORE_AFTER_TRIGGER, sizeof(IGNORE_AFTER_TRIGGER)); | ||
86 | 89 | ||
87 | if (pos != std::string::npos) { // if so, exchange it with 12/24h | 90 | if (pos != std::string::npos) { // if so, exchange it with 12/24h |
88 | std::string newformat = m_tool.timeFormat(); | 91 | std::string newformat = m_tool.timeFormat(); |
@@ -90,7 +93,8 @@ public: | |||
90 | 93 | ||
91 | if (found < 3) { // 24h? erase %P/%p (AM|PM / am|pm) | 94 | if (found < 3) { // 24h? erase %P/%p (AM|PM / am|pm) |
92 | pos = FbTk::StringUtil::findCharFromAlphabetAfterTrigger( | 95 | pos = FbTk::StringUtil::findCharFromAlphabetAfterTrigger( |
93 | newformat, '%', SWITCH_AM_PM, sizeof(SWITCH_AM_PM), 0); | 96 | newformat, '%', SWITCH_AM_PM, sizeof(SWITCH_AM_PM), 0, |
97 | IGNORE_AFTER_TRIGGER, sizeof(IGNORE_AFTER_TRIGGER)); | ||
94 | if (pos != std::string::npos) { | 98 | if (pos != std::string::npos) { |
95 | newformat.erase(pos, 2); | 99 | newformat.erase(pos, 2); |
96 | } | 100 | } |
@@ -107,7 +111,8 @@ private: | |||
107 | void setClockModeLabel() { | 111 | void setClockModeLabel() { |
108 | _FB_USES_NLS; | 112 | _FB_USES_NLS; |
109 | if (FbTk::StringUtil::findCharFromAlphabetAfterTrigger( | 113 | if (FbTk::StringUtil::findCharFromAlphabetAfterTrigger( |
110 | m_tool.timeFormat(), '%', SWITCHES_24_12H, 3, 0) != std::string::npos) { | 114 | m_tool.timeFormat(), '%', SWITCHES_24_12H, 3, 0, |
115 | IGNORE_AFTER_TRIGGER, sizeof(IGNORE_AFTER_TRIGGER)) != std::string::npos) { | ||
111 | setLabel( _FB_XTEXT(Toolbar, Clock24, "Clock: 24h", "set Clockmode to 24h") ); | 116 | setLabel( _FB_XTEXT(Toolbar, Clock24, "Clock: 24h", "set Clockmode to 24h") ); |
112 | } else { | 117 | } else { |
113 | setLabel( _FB_XTEXT(Toolbar, Clock12, "Clock: 12h", "set Clockmode to 12h") ); | 118 | setLabel( _FB_XTEXT(Toolbar, Clock12, "Clock: 12h", "set Clockmode to 12h") ); |