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

remove mention of old useIconbar resource (toolbar modes now do this

Browse source 
task)
This commit is contained in:
rathnor 2003-04-27 04:28:04 +00:00
parent edf60e95de
commit 64d7fa3b96
4 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Toolbar.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: Toolbar.cc,v 1.75 2003/04/25 16:08:45 fluxgen Exp $
// $Id: Toolbar.cc,v 1.76 2003/04/27 04:28:03 rathnor Exp $
#include "Toolbar.hh"
@ -293,11 +293,8 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
frame.base = frame.label = frame.wlabel = frame.clk = frame.button =
frame.pbutton = None;
//DEL/fix -> remove useIconBar resource
// if (Fluxbox::instance()->useIconBar())
m_iconbar.reset(new IconBar(screen(), frame.window_label.window(), m_theme.font()));
XMapSubwindows(display, frame.window.window());
frame.window.show();
@ -370,17 +367,16 @@ bool Toolbar::containsIcon(FluxboxWindow &win) {
}
void Toolbar::enableIconBar() {
// already on
if (m_iconbar.get() != 0)
return;
return; // already on
m_iconbar.reset(new IconBar(screen(), frame.window_label.window(), m_theme.font()));
}
void Toolbar::disableIconBar() {
// already off
if (m_iconbar.get() == 0)
return;
return; // already off
delAllIcons();
m_iconbar.reset(0); // destroy iconbar

4
src/Window.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: Window.cc,v 1.150 2003/04/27 02:26:21 rathnor Exp $
// $Id: Window.cc,v 1.151 2003/04/27 04:28:03 rathnor Exp $
#include "Window.hh"
@ -2899,7 +2899,7 @@ void FluxboxWindow::attachTo(int x, int y) {
//finds and redraw the icon label
void FluxboxWindow::updateIcon() {
if (Fluxbox::instance()->useIconBar()) {
if (screen.getToolbar()) {
const IconBar *iconbar = 0;
const IconBarObj *icon = 0;
if ((iconbar = screen.getToolbar()->iconBar()) != 0) {

3
src/fluxbox.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.cc,v 1.120 2003/04/27 00:36:28 fluxgen Exp $
// $Id: fluxbox.cc,v 1.121 2003/04/27 04:28:04 rathnor Exp $
#include "fluxbox.hh"
@ -365,7 +365,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
m_fbatoms(new FbAtoms()),
m_resourcemanager(), m_screen_rm(),
m_rc_tabs(m_resourcemanager, true, "session.tabs", "Session.Tabs"),
m_rc_iconbar(m_resourcemanager, true, "session.iconbar", "Session.Iconbar"),
m_rc_colors_per_channel(m_resourcemanager, 4,
"session.colorsPerChannel", "Session.ColorsPerChannel"),
m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"),

7
src/fluxbox.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.hh,v 1.50 2003/04/25 15:52:58 fluxgen Exp $
// $Id: fluxbox.hh,v 1.51 2003/04/27 04:28:04 rathnor Exp $
#ifndef FLUXBOX_HH
#define FLUXBOX_HH
@ -79,9 +79,6 @@ public:
static Fluxbox *instance() { return s_singleton; }
inline bool useIconBar() const { return *m_rc_iconbar; }
inline void saveIconBar(bool value) { m_rc_iconbar = value; }
inline Atom getFluxboxPidAtom() const { return m_fluxbox_pid; }
FluxboxWindow *searchGroup(Window, FluxboxWindow *);
@ -219,7 +216,7 @@ private:
ResourceManager m_resourcemanager, m_screen_rm;
//--- Resources
Resource<bool> m_rc_tabs, m_rc_iconbar;
Resource<bool> m_rc_tabs;
Resource<int> m_rc_colors_per_channel, m_rc_numlayers;
Resource<std::string> m_rc_stylefile,
m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile,