/*
-Copyright (C) 2001-2006, William Joseph.
-All Rights Reserved.
+ Copyright (C) 2001-2006, William Joseph.
+ All Rights Reserved.
-This file is part of GtkRadiant.
+ This file is part of GtkRadiant.
-GtkRadiant 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.
+ GtkRadiant 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.
-GtkRadiant 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.
+ GtkRadiant 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 GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ You should have received a copy of the GNU General Public License
+ along with GtkRadiant; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
#include "plugintoolbar.h"
+#include <gtk/gtk.h>
#include "itoolbar.h"
#include "modulesystem.h"
-#include <gtk/gtktoolbar.h>
-
#include "stream/stringstream.h"
#include "gtkutil/image.h"
#include "gtkutil/container.h"
#include "mainframe.h"
#include "plugin.h"
-GtkImage* new_plugin_image(const char* filename)
+ui::Image new_plugin_image(const char *filename)
{
- {
- StringOutputStream fullpath(256);
- fullpath << GameToolsPath_get() << g_pluginsDir << "bitmaps/" << filename;
- GtkImage* image = image_new_from_file_with_mask(fullpath.c_str());
- if(image != 0)
{
- return image;
+ StringOutputStream fullpath(256);
+ fullpath << GameToolsPath_get() << g_pluginsDir << "bitmaps/" << filename;
+ if (auto image = image_new_from_file_with_mask(fullpath.c_str())) { return image; }
}
- }
- {
- StringOutputStream fullpath(256);
- fullpath << AppPath_get() << g_pluginsDir << "bitmaps/" << filename;
- GtkImage* image = image_new_from_file_with_mask(fullpath.c_str());
- if(image != 0)
{
- return image;
+ StringOutputStream fullpath(256);
+ fullpath << AppPath_get() << g_pluginsDir << "bitmaps/" << filename;
+ if (auto image = image_new_from_file_with_mask(fullpath.c_str())) { return image; }
}
- }
- {
- StringOutputStream fullpath(256);
- fullpath << AppPath_get() << g_modulesDir << "bitmaps/" << filename;
- GtkImage* image = image_new_from_file_with_mask(fullpath.c_str());
- if(image != 0)
{
- return image;
+ StringOutputStream fullpath(256);
+ fullpath << AppPath_get() << g_modulesDir << "bitmaps/" << filename;
+ if (auto image = image_new_from_file_with_mask(fullpath.c_str())) { return image; }
}
- }
-
- return image_new_missing();
-}
-inline GtkToolbarChildType gtktoolbarchildtype_for_toolbarbuttontype(IToolbarButton::EType type)
-{
- switch(type)
- {
- case IToolbarButton::eSpace:
- return GTK_TOOLBAR_CHILD_SPACE;
- case IToolbarButton::eButton:
- return GTK_TOOLBAR_CHILD_BUTTON;
- case IToolbarButton::eToggleButton:
- return GTK_TOOLBAR_CHILD_TOGGLEBUTTON;
- case IToolbarButton::eRadioButton:
- return GTK_TOOLBAR_CHILD_RADIOBUTTON;
- }
- ERROR_MESSAGE("invalid toolbar button type");
- return (GtkToolbarChildType)0;
+ return image_new_missing();
}
-void toolbar_insert(GtkToolbar *toolbar, const char* icon, const char* text, const char* tooltip, IToolbarButton::EType type, GtkSignalFunc handler, gpointer data)
+void
+toolbar_insert(ui::Toolbar toolbar, const char *icon, const char *text, const char *tooltip, IToolbarButton::EType type,
+ GCallback handler, gpointer data)
{
- gtk_toolbar_append_element(toolbar, gtktoolbarchildtype_for_toolbarbuttontype(type), 0, text, tooltip, "", GTK_WIDGET(new_plugin_image(icon)), handler, data);
+ if (type == IToolbarButton::eSpace) {
+ auto it = ui::ToolItem::from(gtk_separator_tool_item_new());
+ it.show();
+ toolbar.add(it);
+ return;
+ }
+ if (type == IToolbarButton::eButton) {
+ auto button = ui::ToolButton::from(gtk_tool_button_new(new_plugin_image(icon), text));
+ gtk_widget_set_tooltip_text(button, tooltip);
+ gtk_widget_show_all(button);
+ button.connect("clicked", G_CALLBACK(handler), data);
+ toolbar.add(button);
+ return;
+ }
+ if (type == IToolbarButton::eToggleButton) {
+ auto button = ui::ToolButton::from(gtk_toggle_tool_button_new());
+ gtk_tool_button_set_icon_widget(button, new_plugin_image(icon));
+ gtk_tool_button_set_label(button, text);
+ gtk_widget_set_tooltip_text(button, tooltip);
+ gtk_widget_show_all(button);
+ button.connect("toggled", G_CALLBACK(handler), data);
+ toolbar.add(button);
+ return;
+ }
+ ERROR_MESSAGE("invalid toolbar button type");
}
-void ActivateToolbarButton(GtkWidget *widget, gpointer data)
+void ActivateToolbarButton(ui::ToolButton widget, gpointer data)
{
- const_cast<const IToolbarButton*>(reinterpret_cast<IToolbarButton*>(data))->activate();
+ (const_cast<const IToolbarButton *>( reinterpret_cast<IToolbarButton *>( data )))->activate();
}
-void PlugInToolbar_AddButton(GtkToolbar* toolbar, const IToolbarButton* button)
+void PlugInToolbar_AddButton(ui::Toolbar toolbar, const IToolbarButton *button)
{
- toolbar_insert(toolbar, button->getImage(), button->getText(), button->getTooltip(), button->getType(), GTK_SIGNAL_FUNC(ActivateToolbarButton), reinterpret_cast<gpointer>(const_cast<IToolbarButton*>(button)));
+ toolbar_insert(toolbar, button->getImage(), button->getText(), button->getTooltip(), button->getType(),
+ G_CALLBACK(ActivateToolbarButton),
+ reinterpret_cast<gpointer>( const_cast<IToolbarButton *>( button )));
}
-GtkToolbar* g_plugin_toolbar = 0;
+ui::Toolbar g_plugin_toolbar{ui::null};
void PluginToolbar_populate()
{
- class AddToolbarItemVisitor : public ToolbarModules::Visitor
- {
- GtkToolbar* m_toolbar;
- public:
- AddToolbarItemVisitor(GtkToolbar* toolbar)
- : m_toolbar(toolbar)
- {
- }
- void visit(const char* name, const _QERPlugToolbarTable& table) const
- {
- const std::size_t count = table.m_pfnToolbarButtonCount();
- for(std::size_t i=0;i<count;++i)
- {
- PlugInToolbar_AddButton(m_toolbar, table.m_pfnGetToolbarButton(i));
- }
- }
-
- } visitor(g_plugin_toolbar);
-
- Radiant_getToolbarModules().foreachModule(visitor);
+ class AddToolbarItemVisitor : public ToolbarModules::Visitor {
+ ui::Toolbar m_toolbar;
+ public:
+ AddToolbarItemVisitor(ui::Toolbar toolbar)
+ : m_toolbar(toolbar)
+ {
+ }
+
+ void visit(const char *name, const _QERPlugToolbarTable &table) const
+ {
+ const std::size_t count = table.m_pfnToolbarButtonCount();
+ for (std::size_t i = 0; i < count; ++i) {
+ PlugInToolbar_AddButton(m_toolbar, table.m_pfnGetToolbarButton(i));
+ }
+ }
+
+ } visitor(g_plugin_toolbar);
+
+ Radiant_getToolbarModules().foreachModule(visitor);
}
void PluginToolbar_clear()
{
- container_remove_all(GTK_CONTAINER(g_plugin_toolbar));
+ container_remove_all(g_plugin_toolbar);
}
-GtkToolbar* create_plugin_toolbar()
+ui::Toolbar create_plugin_toolbar()
{
- GtkToolbar *toolbar;
- toolbar = GTK_TOOLBAR(gtk_toolbar_new());
- gtk_toolbar_set_orientation(toolbar, GTK_ORIENTATION_HORIZONTAL);
- gtk_toolbar_set_style(toolbar, GTK_TOOLBAR_ICONS);
- gtk_widget_show(GTK_WIDGET(toolbar));
+ auto toolbar = ui::Toolbar::from(gtk_toolbar_new());
+ gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL);
+ gtk_toolbar_set_style(toolbar, GTK_TOOLBAR_ICONS);
+ toolbar.show();
- g_plugin_toolbar = toolbar;
+ g_plugin_toolbar = toolbar;
- PluginToolbar_populate();
+ PluginToolbar_populate();
- return toolbar;
+ return toolbar;
}
-
-
projects / xonotic / netradiant.git / blobdiff