diff options
Diffstat (limited to 'src/ToolFactory.cc')
-rw-r--r-- | src/ToolFactory.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ToolFactory.cc b/src/ToolFactory.cc index c56645a..eaff8f3 100644 --- a/src/ToolFactory.cc +++ b/src/ToolFactory.cc | |||
@@ -1,5 +1,5 @@ | |||
1 | // ToolFactory.cc for Fluxbox | 1 | // ToolFactory.cc for Fluxbox |
2 | // Copyright (c) 2003-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net) | 2 | // Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at users.sourceforge.net) |
3 | // | 3 | // |
4 | // Permission is hereby granted, free of charge, to any person obtaining a | 4 | // Permission is hereby granted, free of charge, to any person obtaining a |
5 | // copy of this software and associated documentation files (the "Software"), | 5 | // copy of this software and associated documentation files (the "Software"), |
@@ -77,6 +77,8 @@ ToolFactory::ToolFactory(BScreen &screen):m_screen(screen), | |||
77 | m_clock_theme(screen.screenNumber(), "toolbar.clock", "Toolbar.Clock"), | 77 | m_clock_theme(screen.screenNumber(), "toolbar.clock", "Toolbar.Clock"), |
78 | m_button_theme(new ButtonTheme(screen.screenNumber(), "toolbar.button", "Toolbar.Button", | 78 | m_button_theme(new ButtonTheme(screen.screenNumber(), "toolbar.button", "Toolbar.Button", |
79 | "toolbar.clock", "Toolbar.Clock")), | 79 | "toolbar.clock", "Toolbar.Clock")), |
80 | m_systray_theme(new ButtonTheme(screen.screenNumber(), "toolbar.systray", "Toolbar.Systray", | ||
81 | "toolbar.clock", "Toolbar.Systray")), | ||
80 | m_workspace_theme(new WorkspaceNameTheme(screen.screenNumber(), "toolbar.workspace", "Toolbar.Workspace")), | 82 | m_workspace_theme(new WorkspaceNameTheme(screen.screenNumber(), "toolbar.workspace", "Toolbar.Workspace")), |
81 | m_iconbar_theme(screen.screenNumber(), "toolbar.iconbar", "Toolbar.Iconbar") { | 83 | m_iconbar_theme(screen.screenNumber(), "toolbar.iconbar", "Toolbar.Iconbar") { |
82 | 84 | ||
@@ -97,10 +99,9 @@ ToolbarItem *ToolFactory::create(const std::string &name, const FbTk::FbWindow & | |||
97 | witem->button().setOnClick(showmenu); | 99 | witem->button().setOnClick(showmenu); |
98 | item = witem; | 100 | item = witem; |
99 | } else if (name == "iconbar") { | 101 | } else if (name == "iconbar") { |
100 | item = new IconbarTool(parent, m_iconbar_theme, | 102 | item = new IconbarTool(parent, m_iconbar_theme, screen(), tbar.menu()); |
101 | screen(), tbar.menu()); | ||
102 | } else if (name == "systemtray") { | 103 | } else if (name == "systemtray") { |
103 | item = new SystemTray(parent); | 104 | item = new SystemTray(parent, dynamic_cast<ButtonTheme &>(*m_systray_theme), screen()); |
104 | } else if (name == "clock") { | 105 | } else if (name == "clock") { |
105 | item = new ClockTool(parent, m_clock_theme, screen(), tbar.menu()); | 106 | item = new ClockTool(parent, m_clock_theme, screen(), tbar.menu()); |
106 | } else if (name == "nextworkspace" || | 107 | } else if (name == "nextworkspace" || |