aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Toolbar.cc14
-rw-r--r--src/Window.cc4
-rw-r--r--src/fluxbox.cc3
-rw-r--r--src/fluxbox.hh7
4 files changed, 10 insertions, 18 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 39c7f6d..349f1ea 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.75 2003/04/25 16:08:45 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.76 2003/04/27 04:28:03 rathnor Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -293,11 +293,8 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
293 frame.base = frame.label = frame.wlabel = frame.clk = frame.button = 293 frame.base = frame.label = frame.wlabel = frame.clk = frame.button =
294 frame.pbutton = None; 294 frame.pbutton = None;
295 295
296 //DEL/fix -> remove useIconBar resource
297// if (Fluxbox::instance()->useIconBar())
298 m_iconbar.reset(new IconBar(screen(), frame.window_label.window(), m_theme.font())); 296 m_iconbar.reset(new IconBar(screen(), frame.window_label.window(), m_theme.font()));
299 297
300
301 XMapSubwindows(display, frame.window.window()); 298 XMapSubwindows(display, frame.window.window());
302 frame.window.show(); 299 frame.window.show();
303 300
@@ -370,17 +367,16 @@ bool Toolbar::containsIcon(FluxboxWindow &win) {
370} 367}
371 368
372void Toolbar::enableIconBar() { 369void Toolbar::enableIconBar() {
373 // already on
374 if (m_iconbar.get() != 0) 370 if (m_iconbar.get() != 0)
375 return; 371 return; // already on
372
376 m_iconbar.reset(new IconBar(screen(), frame.window_label.window(), m_theme.font())); 373 m_iconbar.reset(new IconBar(screen(), frame.window_label.window(), m_theme.font()));
377} 374}
378 375
379void Toolbar::disableIconBar() { 376void Toolbar::disableIconBar() {
380 // already off
381 if (m_iconbar.get() == 0) 377 if (m_iconbar.get() == 0)
382 return; 378 return; // already off
383 379
384 delAllIcons(); 380 delAllIcons();
385 381
386 m_iconbar.reset(0); // destroy iconbar 382 m_iconbar.reset(0); // destroy iconbar
diff --git a/src/Window.cc b/src/Window.cc
index d148cdc..0e256d1 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.150 2003/04/27 02:26:21 rathnor Exp $ 25// $Id: Window.cc,v 1.151 2003/04/27 04:28:03 rathnor Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -2899,7 +2899,7 @@ void FluxboxWindow::attachTo(int x, int y) {
2899 2899
2900//finds and redraw the icon label 2900//finds and redraw the icon label
2901void FluxboxWindow::updateIcon() { 2901void FluxboxWindow::updateIcon() {
2902 if (Fluxbox::instance()->useIconBar()) { 2902 if (screen.getToolbar()) {
2903 const IconBar *iconbar = 0; 2903 const IconBar *iconbar = 0;
2904 const IconBarObj *icon = 0; 2904 const IconBarObj *icon = 0;
2905 if ((iconbar = screen.getToolbar()->iconBar()) != 0) { 2905 if ((iconbar = screen.getToolbar()->iconBar()) != 0) {
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 8681e48..7b33e49 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.120 2003/04/27 00:36:28 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.121 2003/04/27 04:28:04 rathnor Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -365,7 +365,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
365 m_fbatoms(new FbAtoms()), 365 m_fbatoms(new FbAtoms()),
366 m_resourcemanager(), m_screen_rm(), 366 m_resourcemanager(), m_screen_rm(),
367 m_rc_tabs(m_resourcemanager, true, "session.tabs", "Session.Tabs"), 367 m_rc_tabs(m_resourcemanager, true, "session.tabs", "Session.Tabs"),
368 m_rc_iconbar(m_resourcemanager, true, "session.iconbar", "Session.Iconbar"),
369 m_rc_colors_per_channel(m_resourcemanager, 4, 368 m_rc_colors_per_channel(m_resourcemanager, 4,
370 "session.colorsPerChannel", "Session.ColorsPerChannel"), 369 "session.colorsPerChannel", "Session.ColorsPerChannel"),
371 m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"), 370 m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"),
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 6cd2ca3..ee60094 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.hh,v 1.50 2003/04/25 15:52:58 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.51 2003/04/27 04:28:04 rathnor Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -79,9 +79,6 @@ public:
79 79
80 static Fluxbox *instance() { return s_singleton; } 80 static Fluxbox *instance() { return s_singleton; }
81 81
82 inline bool useIconBar() const { return *m_rc_iconbar; }
83 inline void saveIconBar(bool value) { m_rc_iconbar = value; }
84
85 inline Atom getFluxboxPidAtom() const { return m_fluxbox_pid; } 82 inline Atom getFluxboxPidAtom() const { return m_fluxbox_pid; }
86 83
87 FluxboxWindow *searchGroup(Window, FluxboxWindow *); 84 FluxboxWindow *searchGroup(Window, FluxboxWindow *);
@@ -219,7 +216,7 @@ private:
219 ResourceManager m_resourcemanager, m_screen_rm; 216 ResourceManager m_resourcemanager, m_screen_rm;
220 217
221 //--- Resources 218 //--- Resources
222 Resource<bool> m_rc_tabs, m_rc_iconbar; 219 Resource<bool> m_rc_tabs;
223 Resource<int> m_rc_colors_per_channel, m_rc_numlayers; 220 Resource<int> m_rc_colors_per_channel, m_rc_numlayers;
224 Resource<std::string> m_rc_stylefile, 221 Resource<std::string> m_rc_stylefile,
225 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile, 222 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile,