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

mark a bunch of menus as internal

Browse source
This commit is contained in:
rathnor 2003-05-24 13:13:22 +00:00
parent 292f5c550f
commit bbaca5b43b
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Screen.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.cc,v 1.177 2003/05/24 05:49:31 rathnor Exp $ // $Id: Screen.cc,v 1.178 2003/05/24 13:13:22 rathnor Exp $
#include "Screen.hh" #include "Screen.hh"
@ -520,7 +520,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
resource(rm, screenname, altscreenname), resource(rm, screenname, altscreenname),
m_toolbarhandler(0) { m_toolbarhandler(0) {
Display *disp = FbTk::App::instance()->display(); Display *disp = FbTk::App::instance()->display();
initXinerama(); initXinerama();
@ -626,6 +625,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
} }
workspacemenu.reset(createMenuFromScreen(*this)); workspacemenu.reset(createMenuFromScreen(*this));
workspacemenu->setInternalMenu();
if (*resource.workspaces != 0) { if (*resource.workspaces != 0) {
for (int i = 0; i < *resource.workspaces; ++i) { for (int i = 0; i < *resource.workspaces; ++i) {

5
src/Slit.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Slit.cc,v 1.57 2003/05/19 15:32:47 rathnor Exp $ // $Id: Slit.cc,v 1.58 2003/05/24 13:13:22 rathnor Exp $
#include "Slit.hh" #include "Slit.hh"
@ -1253,7 +1253,8 @@ void Slit::setupMenu() {
SlitSet, SlitSlitPlacement, SlitSet, SlitSlitPlacement,
"Slit Placement")); "Slit Placement"));
m_placement_menu.setMinimumSublevels(3); m_placement_menu.setMinimumSublevels(3);
m_placement_menu.setInternalMenu(); m_layermenu->setInternalMenu();
m_clientlist_menu.setInternalMenu();
// setup items in sub menu // setup items in sub menu

6
src/Toolbar.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Toolbar.cc,v 1.87 2003/05/24 05:49:31 rathnor Exp $ // $Id: Toolbar.cc,v 1.88 2003/05/24 13:13:22 rathnor Exp $
#include "Toolbar.hh" #include "Toolbar.hh"
@ -132,8 +132,6 @@ void setupMenus(Toolbar &tbar) {
tbar.screen().doToolbarAutoHide(), tbar.screen().doToolbarAutoHide(),
reconfig_toolbar_and_save_resource)); reconfig_toolbar_and_save_resource));
menu.setInternalMenu();
menu.insert("Layer...", &tbar.layermenu()); menu.insert("Layer...", &tbar.layermenu());
if (tbar.screen().hasXinerama()) { if (tbar.screen().hasXinerama()) {
@ -286,6 +284,8 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
// we need to get notified when the theme is reloaded // we need to get notified when the theme is reloaded
m_theme.addListener(m_themelistener); m_theme.addListener(m_themelistener);
m_layermenu.setInternalMenu();
m_placementmenu.setInternalMenu();
setupMenus(*this); setupMenus(*this);
// geometry settings // geometry settings

5
src/ToolbarHandler.cc
View file

@ -20,7 +20,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: ToolbarHandler.cc,v 1.13 2003/05/15 23:30:05 fluxgen Exp $ // $Id: ToolbarHandler.cc,v 1.14 2003/05/24 13:13:22 rathnor Exp $
/** /**
* The ToolbarHandler class acts as a rough interface to the toolbar. * The ToolbarHandler class acts as a rough interface to the toolbar.
@ -96,6 +96,7 @@ ToolbarHandler::ToolbarHandler(BScreen &screen, ToolbarMode mode)
screen.screenNumber(), screen.imageControl()) screen.screenNumber(), screen.imageControl())
{ {
m_modemenu.setInternalMenu(); m_modemenu.setInternalMenu();
m_toolbarmenu.setInternalMenu();
setupModeMenu(m_modemenu, *this); setupModeMenu(m_modemenu, *this);
setMode(mode, false); // the atomhandler part will initialise it shortly setMode(mode, false); // the atomhandler part will initialise it shortly
} }
@ -116,9 +117,9 @@ void ToolbarHandler::setMode(ToolbarMode mode, bool initialise) {
return; return;
} else if (!m_toolbar.get()) { } else if (!m_toolbar.get()) {
m_toolbarmenu.removeAll(); m_toolbarmenu.removeAll();
m_toolbar.reset(new Toolbar(m_screen, m_toolbar.reset(new Toolbar(m_screen,
*m_screen.layerManager().getLayer(m_screen.getToolbarLayerNum()), m_toolbarmenu)); *m_screen.layerManager().getLayer(m_screen.getToolbarLayerNum()), m_toolbarmenu));
m_toolbarmenu.insert("Mode...", &m_modemenu); m_toolbarmenu.insert("Mode...", &m_modemenu);
m_toolbarmenu.update(); m_toolbarmenu.update();
} }