ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reworked MiniButton as a template class

Browse source
This commit is contained in:
Joel Holdsworth 2009-03-14 15:01:16 +00:00
parent babb46a4ad
commit 3769719f7e
5 changed files with 37 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gui/Makefile.am
View file

@ -82,7 +82,6 @@ gtk_gui_la_SOURCES = \
$(lumigui_srcdir)/widgets/button-bar.hpp \
$(lumigui_srcdir)/widgets/menu-button.cpp \
$(lumigui_srcdir)/widgets/menu-button.hpp \
$(lumigui_srcdir)/widgets/mini-button.cpp \
$(lumigui_srcdir)/widgets/mini-button.hpp \
$(lumigui_srcdir)/widgets/video-display-widget.cpp \
$(lumigui_srcdir)/widgets/video-display-widget.hpp \

14
src/gui/widgets/button-bar.cpp
View file

@ -34,20 +34,6 @@ ButtonBar::ButtonBar()
{
}
void
ButtonBar::append(MiniButton& button)
{
pack_start(button, PACK_SHRINK);
}
void
ButtonBar::append(MiniButton& button,
const sigc::slot<void>& clicked_slot)
{
button.signal_clicked().connect(clicked_slot);
append(button);
}
void
ButtonBar::append(SeparatorToolItem &seperator)
{

15
src/gui/widgets/button-bar.hpp
View file

@ -46,16 +46,23 @@ public:
* Append a button to the button bar.
* @param button The button to append.
**/
void append(MiniButton& button);
template<class T> void append(MiniWrapper<T>& button)
{
pack_start(button, Gtk::PACK_SHRINK);
}
/**
* Append a button to the button bar, and connect a click event.
* @param button The button to append.
* @param clicked_slot The slot to connect.
**/
void append(MiniButton& button,
const sigc::slot<void>& clicked_slot);
template<class T> void append(MiniWrapper<T>& button,
const sigc::slot<void>& clicked_slot)
{
button.signal_clicked().connect(clicked_slot);
append(button);
}
/**
* Append a sererator item.
* @param seperator The seperator to append.

50
src/gui/widgets/mini-button.cpp
View file

@ -1,50 +0,0 @@
/*
mini-button.cpp - Implementation of the mini button widget
Copyright (C) Lumiera.org
2009, Joel Holdsworth <joel@airwebreathe.org.uk>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *****************************************************/
#include "mini-button.hpp"
#include <nobug.h>
using namespace Gtk;
using namespace sigc;
namespace gui {
namespace widgets {
MiniButton::MiniButton(const StockID& stock_id,
const IconSize icon_size) :
image(stock_id, icon_size)
{
add(image);
set_relief(RELIEF_NONE);
set_focus_on_click(false);
}
void
MiniButton::set_stock_id(const StockID& stock_id,
const IconSize icon_size)
{
image.set(stock_id, icon_size);
}
} // widgets
} // gui

32
src/gui/widgets/mini-button.hpp
View file

@ -32,9 +32,10 @@ namespace gui {
namespace widgets {
/**
* A ToolButton-like widget
* A wrapper for ToolButton-like Button widgets
**/
class MiniButton : public Gtk::Button
template<class T>
class MiniWrapper : public T
{
public:
@ -46,16 +47,25 @@ public:
* @remarks Stock ids have identifiers like Gtk::Stock::OK and
* Gtk::Stock::APPLY.
**/
MiniButton(const Gtk::StockID& stock_id,
const Gtk::IconSize icon_size = Gtk::ICON_SIZE_LARGE_TOOLBAR);
MiniWrapper(const Gtk::StockID& stock_id,
const Gtk::IconSize icon_size = Gtk::ICON_SIZE_LARGE_TOOLBAR) :
image(stock_id, icon_size)
{
T::add(image);
T::set_relief(Gtk::RELIEF_NONE);
T::set_focus_on_click(false);
}
/**
* Sets a new image from a stock-id for this button.
* @param stock_id The stock_id of the image.
* @param icon_size The size of the image to show.
**/
void set_stock_id(const Gtk::StockID& stock_id,
const Gtk::IconSize icon_size = Gtk::ICON_SIZE_LARGE_TOOLBAR);
const Gtk::IconSize icon_size = Gtk::ICON_SIZE_LARGE_TOOLBAR)
{
image.set(stock_id, icon_size);
}
private:
@ -65,6 +75,16 @@ private:
Gtk::Image image;
};
/**
* A ToolButton-like widget
**/
typedef MiniWrapper<Gtk::Button> MiniButton;
/**
* A ToggleToolButton-like widget
**/
typedef MiniWrapper<Gtk::ToggleButton> MiniToggleButton;
} // gui
} // widgets