nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more fixes for !strftime

Browse source
This commit is contained in:
rathnor 2003-03-23 04:18:59 +00:00
parent 029e4e5dc7
commit 227e0b0ab1
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Toolbar.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Toolbar.cc,v 1.66 2003/03/23 01:33:31 rathnor Exp $ // $Id: Toolbar.cc,v 1.67 2003/03/23 04:18:59 rathnor Exp $
#include "Toolbar.hh" #include "Toolbar.hh"
@ -94,12 +94,12 @@ void setupMenus(Toolbar &tbar) {
RefCount<Command> start_edit(new SimpleCommand<Toolbar>(tbar, &Toolbar::edit)); RefCount<Command> start_edit(new SimpleCommand<Toolbar>(tbar, &Toolbar::edit));
menu.insert(i18n->getMessage( menu.insert(i18n->getMessage(
ToolbarSet, ToolbarEditWkspcName, FBNLS::ToolbarSet, FBNLS::ToolbarEditWkspcName,
"Edit current workspace name"), "Edit current workspace name"),
start_edit); start_edit);
menu.setLabel(i18n->getMessage( menu.setLabel(i18n->getMessage(
ToolbarSet, ToolbarToolbarTitle, FBNLS::ToolbarSet, FBNLS::ToolbarToolbarTitle,
"Toolbar")); "Toolbar"));
menu.setInternalMenu(); menu.setInternalMenu();
@ -406,12 +406,13 @@ void Toolbar::reconfigure() {
frame.clock_w = 0; frame.clock_w = 0;
#else // !HAVE_STRFTIME #else // !HAVE_STRFTIME
I18n *i18n = I18n::instance();
frame.clock_w = m_theme.font().textWidth( frame.clock_w = m_theme.font().textWidth(
i18n->getMessage( i18n->getMessage(
ToolbarSet, ToolbarNoStrftimeLength, FBNLS::ToolbarSet, FBNLS::ToolbarNoStrftimeLength,
"00:00000"), "00:00000"),
strlen(i18n->getMessage( strlen(i18n->getMessage(
ToolbarSet, ToolbarNoStrftimeLength, FBNLS::ToolbarSet, FBNLS::ToolbarNoStrftimeLength,
"00:00000"))) + (frame.bevel_w * 4); "00:00000"))) + (frame.bevel_w * 4);
#endif // HAVE_STRFTIME #endif // HAVE_STRFTIME
@ -660,20 +661,21 @@ void Toolbar::checkClock(bool redraw, bool date) {
if (! strftime(t, 1024, screen().getStrftimeFormat(), tt)) if (! strftime(t, 1024, screen().getStrftimeFormat(), tt))
return; return;
#else // !HAVE_STRFTIME #else // !HAVE_STRFTIME
I18n *i18n = I18n::instance();
char t[9]; char t[9];
if (date) { if (date) {
// format the date... with special consideration for y2k ;) // format the date... with special consideration for y2k ;)
if (screen().getDateFormat() == Fluxbox::B_EUROPEANDATE) { if (screen().getDateFormat() == Fluxbox::B_EUROPEANDATE) {
sprintf(t, sprintf(t,
i18n->getMessage( i18n->getMessage(
ToolbarSet, ToolbarNoStrftimeDateFormatEu, FBNLS::ToolbarSet, FBNLS::ToolbarNoStrftimeDateFormatEu,
"%02d.%02d.%02d"), "%02d.%02d.%02d"),
tt->tm_mday, tt->tm_mon + 1, tt->tm_mday, tt->tm_mon + 1,
(tt->tm_year >= 100) ? tt->tm_year - 100 : tt->tm_year); (tt->tm_year >= 100) ? tt->tm_year - 100 : tt->tm_year);
} else { } else {
sprintf(t, sprintf(t,
i18n->getMessage( i18n->getMessage(
ToolbarSet, ToolbarNoStrftimeDateFormat, FBNLS::ToolbarSet, FBNLS::ToolbarNoStrftimeDateFormat,
"%02d/%02d/%02d"), "%02d/%02d/%02d"),
tt->tm_mon + 1, tt->tm_mday, tt->tm_mon + 1, tt->tm_mday,
(tt->tm_year >= 100) ? tt->tm_year - 100 : tt->tm_year); (tt->tm_year >= 100) ? tt->tm_year - 100 : tt->tm_year);
@ -682,22 +684,22 @@ void Toolbar::checkClock(bool redraw, bool date) {
if (screen().isClock24Hour()) { if (screen().isClock24Hour()) {
sprintf(t, sprintf(t,
i18n->getMessage( i18n->getMessage(
ToolbarSet, ToolbarNoStrftimeTimeFormat24, FBNLS::ToolbarSet, FBNLS::ToolbarNoStrftimeTimeFormat24,
" %02d:%02d "), " %02d:%02d "),
frame.hour, frame.minute); frame.hour, frame.minute);
} else { } else {
sprintf(t, sprintf(t,
i18n->getMessage( i18n->getMessage(
ToolbarSet, ToolbarNoStrftimeTimeFormat12, FBNLS::ToolbarSet, FBNLS::ToolbarNoStrftimeTimeFormat12,
"%02d:%02d %sm"), "%02d:%02d %sm"),
((frame.hour > 12) ? frame.hour - 12 : ((frame.hour > 12) ? frame.hour - 12 :
((frame.hour == 0) ? 12 : frame.hour)), frame.minute, ((frame.hour == 0) ? 12 : frame.hour)), frame.minute,
((frame.hour >= 12) ? ((frame.hour >= 12) ?
i18n->getMessage( i18n->getMessage(
ToolbarSet, ToolbarNoStrftimeTimeFormatP, FBNLS::ToolbarSet, FBNLS::ToolbarNoStrftimeTimeFormatP,
"p") : "p") :
i18n->getMessage( i18n->getMessage(
ToolbarSet, ToolbarNoStrftimeTimeFormatA, FBNLS::ToolbarSet, FBNLS::ToolbarNoStrftimeTimeFormatA,
"a"))); "a")));
} }
} }
@ -900,7 +902,7 @@ void Toolbar::buttonReleaseEvent(XButtonEvent &re) {
screen().raiseFocus(); screen().raiseFocus();
#ifndef HAVE_STRFTIME #ifndef HAVE_STRFTIME
else if (re.window == frame.clock) { else if (re.window == frame.clock) {
XClearWindow(display, frame.clock); frame.clock.clear();
checkClock(true); checkClock(true);
} }
#endif // HAVE_STRFTIME #endif // HAVE_STRFTIME