aboutsummaryrefslogtreecommitdiff
path: root/src/ClockTool.hh
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-04-29 08:52:28 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-05-10 11:00:45 (GMT)
commitf7d7dfd2a8047207dbe90bc77592c25acf4ca15c (patch)
tree46eb8596d15fb0450f07e3e5d58e2c5449c4c020 /src/ClockTool.hh
parent54230c9a4474baf4f1c56773992212093e222349 (diff)
downloadfluxbox-f7d7dfd2a8047207dbe90bc77592c25acf4ca15c.zip
fluxbox-f7d7dfd2a8047207dbe90bc77592c25acf4ca15c.tar.bz2
Convert FbTk::Theme::reconfigSig and friends to the new Signal system
I removed the const versions of reconfigSig() in the process since FbTk::Signal has no const methods anyway.
Diffstat (limited to 'src/ClockTool.hh')
-rw-r--r--src/ClockTool.hh9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ClockTool.hh b/src/ClockTool.hh
index d2b9dca..4f89b36 100644
--- a/src/ClockTool.hh
+++ b/src/ClockTool.hh
@@ -26,8 +26,8 @@
26 26
27#include "ToolbarItem.hh" 27#include "ToolbarItem.hh"
28 28
29#include "FbTk/Signal.hh"
29#include "FbTk/TextButton.hh" 30#include "FbTk/TextButton.hh"
30#include "FbTk/Observer.hh"
31#include "FbTk/Resource.hh" 31#include "FbTk/Resource.hh"
32#include "FbTk/Timer.hh" 32#include "FbTk/Timer.hh"
33#include "FbTk/FbString.hh" 33#include "FbTk/FbString.hh"
@@ -37,12 +37,11 @@ class BScreen;
37 37
38namespace FbTk { 38namespace FbTk {
39class ImageControl; 39class ImageControl;
40class Subject;
41class Menu; 40class Menu;
42template <class T> class ThemeProxy; 41template <class T> class ThemeProxy;
43} 42}
44 43
45class ClockTool:public ToolbarItem, public FbTk::Observer { 44class ClockTool:public ToolbarItem {
46public: 45public:
47 ClockTool(const FbTk::FbWindow &parent, FbTk::ThemeProxy<ToolTheme> &theme, 46 ClockTool(const FbTk::FbWindow &parent, FbTk::ThemeProxy<ToolTheme> &theme,
48 BScreen &screen, FbTk::Menu &menu); 47 BScreen &screen, FbTk::Menu &menu);
@@ -68,7 +67,7 @@ public:
68 67
69private: 68private:
70 void updateTime(); 69 void updateTime();
71 void update(FbTk::Subject *subj); 70 void themeReconfigured();
72 void renderTheme(int alpha); 71 void renderTheme(int alpha);
73 void reRender(); 72 void reRender();
74 void updateSizing(); 73 void updateSizing();
@@ -83,6 +82,8 @@ private:
83 FbTk::Resource<std::string> m_timeformat; 82 FbTk::Resource<std::string> m_timeformat;
84 83
85 FbTk::StringConvertor m_stringconvertor; 84 FbTk::StringConvertor m_stringconvertor;
85
86 FbTk::SignalTracker m_tracker;
86}; 87};
87 88
88#endif // CLOCKTOOL_HH 89#endif // CLOCKTOOL_HH