Attachment #36661 for bug #58672

View | Details | Raw Unified | Return to bug 58672
Collapse All | Expand All

Lines 204-209 Link Here

(-)src/Toolbar.cc (-1 / +9 lines)
204	}	204	}
205		205
206	void Toolbar::reconfigure() {	206	void Toolbar::reconfigure() {
		207	I18n *i18n = I18n::instance();
207	int head_x = 0,	208	int head_x = 0,
208	head_y = 0,	209	head_y = 0,
209	head_w,	210	head_w,
Lines 318-323 Link Here
318	frame.clock_w = 0;	319	frame.clock_w = 0;
319	#else // !HAVE_STRFTIME	320	#else // !HAVE_STRFTIME
320		321
		322	using namespace FBNLS;
321	frame.clock_w = screen()->getToolbarStyle()->font.textWidth(	323	frame.clock_w = screen()->getToolbarStyle()->font.textWidth(
322	i18n->getMessage(	324	i18n->getMessage(
323	ToolbarSet, ToolbarNoStrftimeLength,	325	ToolbarSet, ToolbarNoStrftimeLength,
Lines 521-526 Link Here
521	void Toolbar::checkClock(bool redraw, bool date) {	523	void Toolbar::checkClock(bool redraw, bool date) {
522	time_t tmp = 0;	524	time_t tmp = 0;
523	struct tm *tt = 0;	525	struct tm *tt = 0;
		526	I18n *i18n = I18n::instance();
		527
524		528
525	if ((tmp = time(NULL)) != -1) {	529	if ((tmp = time(NULL)) != -1) {
526	if (! (tt = localtime(&tmp))) {	530	if (! (tt = localtime(&tmp))) {
Lines 545-553 Link Here
545	return;	549	return;
546	#else // !HAVE_STRFTIME	550	#else // !HAVE_STRFTIME
547	char t[9];	551	char t[9];
		552	using namespace FBNLS;
		553
548	if (date) {	554	if (date) {
549	// format the date... with special consideration for y2k ;)	555	// format the date... with special consideration for y2k ;)
550	if (screen()->getDateFormat() == Blackbox::B_EuropeanDate) {	556	if (screen()->getDateFormat() == Fluxbox::B_EuropeanDate) {
551	sprintf(t,	557	sprintf(t,
552	i18n->getMessage(	558	i18n->getMessage(
553	ToolbarSet, ToolbarNoStrftimeDateFormatEu,	559	ToolbarSet, ToolbarNoStrftimeDateFormatEu,
Lines 1101-1106 Link Here
1101	CommonSet, CommonAutoHide,	1107	CommonSet, CommonAutoHide,
1102	"Auto hide"),	1108	"Auto hide"),
1103	2);	1109	2);
		1110
		1111	using namespace FBNLS;
1104	insert(i18n->getMessage(	1112	insert(i18n->getMessage(
1105	ToolbarSet, ToolbarEditWkspcName,	1113	ToolbarSet, ToolbarEditWkspcName,
1106	"Edit current workspace name"),	1114	"Edit current workspace name"),

Lines 159-164 Link Here

(-)src/Toolbar.hh (+1 lines)
159	bool do_auto_hide; ///< do we auto hide	159	bool do_auto_hide; ///< do we auto hide
160	Display *display; ///< display connection	160	Display *display; ///< display connection
161		161
		162
162	struct frame {	163	struct frame {
163	unsigned long button_pixel, pbutton_pixel;	164	unsigned long button_pixel, pbutton_pixel;
164	Pixmap base, label, wlabel, clk, button, pbutton;	165	Pixmap base, label, wlabel, clk, button, pbutton;

Lines 184-190 Link Here

(-)src/fluxbox.hh (-1 / +1 lines)
184		184
185	#ifndef HAVE_STRFTIME	185	#ifndef HAVE_STRFTIME
186		186
187	enum { B_AMERICANDATE = 1, B_EUROPEANDATE };	187	enum { B_AmericanDate = 1, B_EuropeanDate };
188	#endif // HAVE_STRFTIME	188	#endif // HAVE_STRFTIME
189		189
190	typedef std::vector<Fluxbox::Titlebar> TitlebarList;	190	typedef std::vector<Fluxbox::Titlebar> TitlebarList;

Lines 29-34 Link Here

(-)util/fbrun/FbRun.hh (+1 lines)
29		29
30	#include <string>	30	#include <string>
31	#include <vector>	31	#include <vector>
		32	#include <cassert>
32		33
33	/**	34	/**
34	Creates and managed a run window	35	Creates and managed a run window

Return to bug 58672