![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index eb5ff11a46980eb1227b09f0d5d3cd442b40f5bd..146853c2258d10716a08fbe89703cc75757a9db4 100644 (file)
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
# include "config.h"
#endif
+#include <gtkmm.h>
#include <gtk/gtk.h>
#include "widgets/button.h"
#include "widgets/spw-utilities.h"
#include "widgets/spinbutton-events.h"
+#include "ui/widget/style-swatch.h"
+
#include "prefs-utils.h"
#include "verbs.h"
#include "sp-namedview.h"
#include "sp-star.h"
#include "sp-spiral.h"
#include "sp-ellipse.h"
+#include "sp-text.h"
+#include "sp-flowtext.h"
+#include "style.h"
#include "selection.h"
#include "document-private.h"
+#include "desktop-style.h"
+#include "../libnrtype/font-lister.h"
+#include "../connection-pool.h"
#include "mod360.h"
static GtkWidget *sp_arc_toolbox_new(SPDesktop *desktop);
static GtkWidget *sp_rect_toolbox_new(SPDesktop *desktop);
static GtkWidget *sp_spiral_toolbox_new(SPDesktop *desktop);
+static GtkWidget *sp_pencil_toolbox_new(SPDesktop *desktop);
+static GtkWidget *sp_pen_toolbox_new(SPDesktop *desktop);
static GtkWidget *sp_calligraphy_toolbox_new(SPDesktop *desktop);
static GtkWidget *sp_dropper_toolbox_new(SPDesktop *desktop);
static GtkWidget *sp_empty_toolbox_new(SPDesktop *desktop);
-static GtkWidget *sp_text_toolbox_new(SPDesktop *desktop);
static GtkWidget *sp_connector_toolbox_new(SPDesktop *desktop);
+namespace { GtkWidget *sp_text_toolbox_new (SPDesktop *desktop); }
+
static struct {
gchar const *type_name;
{ "SPRectContext", "rect_toolbox", sp_rect_toolbox_new },
{ "SPArcContext", "arc_toolbox", sp_arc_toolbox_new },
{ "SPSpiralContext", "spiral_toolbox", sp_spiral_toolbox_new },
- { "SPPencilContext", "pencil_toolbox", NULL },
- { "SPPenContext", "pen_toolbox", NULL },
+ { "SPPencilContext", "pencil_toolbox", sp_pencil_toolbox_new },
+ { "SPPenContext", "pen_toolbox", sp_pen_toolbox_new },
{ "SPDynaDrawContext", "calligraphy_toolbox", sp_calligraphy_toolbox_new },
{ "SPTextContext", "text_toolbox", sp_text_toolbox_new },
{ "SPDropperContext", "dropper_toolbox", sp_dropper_toolbox_new },
{ NULL, NULL, NULL }
};
-static void toolbox_set_desktop(GtkWidget *toolbox, SPDesktop *desktop, SetupFunction setup_func, UpdateFunction update_func, sigc::connection*);
+static void toolbox_set_desktop (GtkWidget *toolbox, SPDesktop *desktop, SetupFunction setup_func, UpdateFunction update_func, sigc::connection*);
+
+static void setup_tool_toolbox (GtkWidget *toolbox, SPDesktop *desktop);
+static void update_tool_toolbox (SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox);
-static void setup_tool_toolbox(GtkWidget *toolbox, SPDesktop *desktop);
-static void update_tool_toolbox(SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox);
-static void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop);
-static void update_aux_toolbox(SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox);
-static void setup_commands_toolbox(GtkWidget *toolbox, SPDesktop *desktop);
-static void update_commands_toolbox(SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox);
+static void setup_aux_toolbox (GtkWidget *toolbox, SPDesktop *desktop);
+static void update_aux_toolbox (SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox);
+
+static void setup_commands_toolbox (GtkWidget *toolbox, SPDesktop *desktop);
+static void update_commands_toolbox (SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox);
/* Global text entry widgets necessary for update */
/* GtkWidget *dropper_rgb_entry,
@@ -158,7 +172,6 @@ sp_toolbox_button_new(GtkWidget *t, Inkscape::IconSize size, gchar const *pxname
return b;
}
-
GtkWidget *
sp_toolbox_button_new_from_verb_with_doubleclick(GtkWidget *t, Inkscape::IconSize size, SPButtonType type,
Inkscape::Verb *verb, Inkscape::Verb *doubleclick_verb,
sp_node_selected_set_type(Inkscape::NodePath::NODE_SYMM);
}
-
+static void toggle_show_handles (GtkWidget *button, gpointer data) {
+ bool show = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ prefs_set_int_attribute ("tools.nodes", "show_handles", show ? 1 : 0);
+ sp_nodepath_show_handles(show);
+}
//################################
//## Node Editing Toolbox ##
gtk_box_pack_start(GTK_BOX(tb), gtk_hbox_new(FALSE, 0), FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS);
sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_join",
- GTK_SIGNAL_FUNC(sp_node_path_edit_join), tt, _("Join paths at selected nodes"));
+ GTK_SIGNAL_FUNC(sp_node_path_edit_join), tt, _("Join selected endnodes"));
sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_join_segment",
- GTK_SIGNAL_FUNC(sp_node_path_edit_join_segment), tt, _("Join paths at selected nodes with new segment"));
+ GTK_SIGNAL_FUNC(sp_node_path_edit_join_segment), tt, _("Join selected endnodes with a new segment"));
sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_delete_segment",
GTK_SIGNAL_FUNC(sp_node_path_edit_delete_segment), tt, _("Split path between two non-endpoint nodes"));
sp_toolbox_button_normal_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_SELECTION_OUTLINE), view, tt);
+ aux_toolbox_space(tb, AUX_BETWEEN_BUTTON_GROUPS);
+
+ GtkWidget *cvbox = gtk_vbox_new (FALSE, 0);
+ GtkWidget *cbox = gtk_hbox_new (FALSE, 0);
+
+ {
+ GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION,
+ SP_BUTTON_TYPE_TOGGLE,
+ NULL,
+ "nodes_show_handles",
+ _("Show the Bezier handles of selected nodes"),
+ tt);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), prefs_get_int_attribute ("tools.nodes", "show_handles", 1));
+ g_signal_connect_after (G_OBJECT (button), "clicked", G_CALLBACK (toggle_show_handles), desktop);
+ gtk_box_pack_start(GTK_BOX(cbox), button, FALSE, FALSE, 0);
+ }
+
+ gtk_box_pack_start(GTK_BOX(cvbox), cbox, TRUE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(tb), cvbox, FALSE, FALSE, 0);
+
gtk_widget_show_all(tb);
return tb;
toolbox_set_desktop(gtk_bin_get_child(GTK_BIN(toolbox)), desktop, setup_commands_toolbox, update_commands_toolbox, static_cast<sigc::connection*>(g_object_get_data(G_OBJECT(toolbox), "event_context_connection")));
}
-
static void
toolbox_set_desktop(GtkWidget *toolbox, SPDesktop *desktop, SetupFunction setup_func, UpdateFunction update_func, sigc::connection *conn)
{
gboolean altx, gchar const *altx_mark,
gdouble lower, gdouble upper, gdouble step, gdouble page,
void (*callback)(GtkAdjustment *, GtkWidget *),
- gdouble climb = 0.1, guint digits = 3)
+ gdouble climb = 0.1, guint digits = 3, double factor = 1.0)
{
GtkTooltips *tt = gtk_tooltips_new();
gtk_misc_set_alignment(GTK_MISC(l), 1.0, 0.5);
gtk_container_add(GTK_CONTAINER(hb), l);
- GtkObject *a = gtk_adjustment_new(prefs_get_double_attribute(path, data, def),
+ GtkObject *a = gtk_adjustment_new(prefs_get_double_attribute(path, data, def) * factor,
lower, upper, step, page, page);
gtk_object_set_data(GTK_OBJECT(tbl), data, a);
if (us)
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
// do not remember prefs if this call is initiated by an undo change, because undoing object
// creation sets bogus values to its attributes before it is deleted
prefs_set_int_attribute("tools.shapes.star", "magnitude", (gint)adj->value);
bool modmade = false;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *items = selection->itemList();
for (; items != NULL; items = items->next) {
if (SP_IS_STAR((SPItem *) items->data)) {
modmade = true;
}
}
- if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop));
+ if (modmade) sp_document_done(sp_desktop_document(desktop));
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
prefs_set_double_attribute("tools.shapes.star", "proportion", adj->value);
}
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE));
bool modmade = false;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *items = selection->itemList();
for (; items != NULL; items = items->next) {
if (SP_IS_STAR((SPItem *) items->data)) {
}
}
- if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop));
+ if (modmade) sp_document_done(sp_desktop_document(desktop));
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
prefs_set_string_attribute("tools.shapes.star", "isflatsided", "true");
} else {
// in turn, prevent listener from responding
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE));
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *items = selection->itemList();
GtkWidget *prop_widget = (GtkWidget*) g_object_get_data(G_OBJECT(tbl), "prop_widget");
bool modmade = false;
}
}
}
- if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop));
+ if (modmade) sp_document_done(sp_desktop_document(desktop));
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
prefs_set_double_attribute("tools.shapes.star", "rounded", (gdouble) adj->value);
}
bool modmade = false;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *items = selection->itemList();
for (; items != NULL; items = items->next) {
if (SP_IS_STAR((SPItem *) items->data)) {
modmade = true;
}
}
- if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop));
+ if (modmade) sp_document_done(sp_desktop_document(desktop));
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
prefs_set_double_attribute("tools.shapes.star", "randomized", (gdouble) adj->value);
}
bool modmade = false;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList const *items = selection->itemList();
for (; items != NULL; items = items->next) {
if (SP_IS_STAR((SPItem *) items->data)) {
modmade = true;
}
}
- if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop));
+ if (modmade) sp_document_done(sp_desktop_document(desktop));
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
@@ -1086,6 +1122,7 @@ sp_star_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *tbl
g_object_set_data(G_OBJECT(tbl), "repr", repr);
Inkscape::GC::anchor(repr);
sp_repr_add_listener(repr, &star_tb_repr_events, tbl);
+ sp_repr_synthesize_events(repr, &star_tb_repr_events, tbl);
}
} else {
// FIXME: implement averaging of all parameters for multiple selected stars
gtk_box_pack_start(GTK_BOX(tbl),hb, FALSE, FALSE, AUX_SPACING);
}
+ Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL);
+ swatch->setWatchedTool ("tools.shapes.star", true);
+ GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj());
+ gtk_box_pack_end(GTK_BOX(tbl), swatch_, FALSE, FALSE, 0);
+
gtk_widget_show_all(tbl);
sp_set_font_size_smaller (tbl);
sigc::connection *connection = new sigc::connection(
- SP_DT_SELECTION(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_star_toolbox_selection_changed), (GtkObject *)tbl))
+ sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_star_toolbox_selection_changed), (GtkObject *)tbl))
);
g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), connection);
@@ -1283,7 +1325,7 @@ sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name
GtkWidget *us = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(tbl), "units");
SPUnit const *unit = sp_unit_selector_get_unit(SP_UNIT_SELECTOR(us));
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
prefs_set_double_attribute("tools.shapes.rect", value_name, sp_units_get_pixels(adj->value, *unit));
}
@@ -1296,7 +1338,7 @@ sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE));
bool modmade = false;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
for (GSList const *items = selection->itemList(); items != NULL; items = items->next) {
if (SP_IS_RECT(items->data)) {
if (adj->value != 0) {
@@ -1311,7 +1353,7 @@ sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name
sp_rtb_sensitivize (tbl);
if (modmade) {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
@@ -1479,6 +1521,7 @@ sp_rect_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *tbl
g_object_set_data(G_OBJECT(tbl), "item", item);
Inkscape::GC::anchor(repr);
sp_repr_add_listener(repr, &rect_tb_repr_events, tbl);
+ sp_repr_synthesize_events(repr, &rect_tb_repr_events, tbl);
}
} else {
// FIXME: implement averaging of all parameters for multiple selected
gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS);
}
+ Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL);
+ swatch->setWatchedTool ("tools.shapes.rect", true);
+ GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj());
+ gtk_box_pack_end(GTK_BOX(tbl), swatch_, FALSE, FALSE, 0);
+
g_object_set_data(G_OBJECT(tbl), "single", GINT_TO_POINTER(TRUE));
sp_rtb_sensitivize (tbl);
sp_set_font_size_smaller (tbl);
sigc::connection *connection = new sigc::connection(
- SP_DT_SELECTION(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_rect_toolbox_selection_changed), (GtkObject *)tbl))
+ sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_rect_toolbox_selection_changed), (GtkObject *)tbl))
);
g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), connection);
@@ -1591,7 +1639,7 @@ sp_spl_tb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_n
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
prefs_set_double_attribute("tools.shapes.spiral", value_name, adj->value);
}
@@ -1606,7 +1654,7 @@ sp_spl_tb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_n
gchar* namespaced_name = g_strconcat("sodipodi:", value_name, NULL);
bool modmade = false;
- for (GSList const *items = SP_DT_SELECTION(desktop)->itemList();
+ for (GSList const *items = sp_desktop_selection(desktop)->itemList();
items != NULL;
items = items->next)
{
@@ -1621,7 +1669,7 @@ sp_spl_tb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_n
g_free(namespaced_name);
if (modmade) {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
@@ -1747,6 +1795,7 @@ sp_spiral_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *t
g_object_set_data(G_OBJECT(tbl), "repr", repr);
Inkscape::GC::anchor(repr);
sp_repr_add_listener(repr, &spiral_tb_repr_events, tbl);
+ sp_repr_synthesize_events(repr, &spiral_tb_repr_events, tbl);
}
} else {
// FIXME: implement averaging of all parameters for multiple selected
gtk_box_pack_start(GTK_BOX(tbl),hb, FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS);
}
+ Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL);
+ swatch->setWatchedTool ("tools.shapes.spiral", true);
+ GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj());
+ gtk_box_pack_end(GTK_BOX(tbl), swatch_, FALSE, FALSE, 0);
+
gtk_widget_show_all(tbl);
sp_set_font_size_smaller (tbl);
sigc::connection *connection = new sigc::connection(
- SP_DT_SELECTION(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_spiral_toolbox_selection_changed), (GtkObject *)tbl))
+ sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_spiral_toolbox_selection_changed), (GtkObject *)tbl))
);
g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), connection);
return tbl;
}
+//########################
+//## Pen/Pencil ##
+//########################
+
+
+static GtkWidget *
+sp_pen_toolbox_new(SPDesktop *desktop)
+{
+ GtkWidget *tbl = gtk_hbox_new(FALSE, 0);
+ gtk_object_set_data(GTK_OBJECT(tbl), "dtw", desktop->canvas);
+ gtk_object_set_data(GTK_OBJECT(tbl), "desktop", desktop);
+
+ Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL);
+ swatch->setWatchedTool ("tools.freehand.pen", true);
+ GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj());
+ gtk_box_pack_end(GTK_BOX(tbl), swatch_, FALSE, FALSE, 0);
+
+ gtk_widget_show_all(tbl);
+ sp_set_font_size_smaller (tbl);
+
+ return tbl;
+}
+
+static GtkWidget *
+sp_pencil_toolbox_new(SPDesktop *desktop)
+{
+ GtkWidget *tbl = gtk_hbox_new(FALSE, 0);
+ gtk_object_set_data(GTK_OBJECT(tbl), "dtw", desktop->canvas);
+ gtk_object_set_data(GTK_OBJECT(tbl), "desktop", desktop);
+
+ Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL);
+ swatch->setWatchedTool ("tools.freehand.pencil", true);
+ GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj());
+ gtk_box_pack_end(GTK_BOX(tbl), swatch_, FALSE, FALSE, 0);
+
+ gtk_widget_show_all(tbl);
+ sp_set_font_size_smaller (tbl);
+
+ return tbl;
+}
+
//########################
//## Calligraphy ##
static void
sp_ddc_width_value_changed(GtkAdjustment *adj, GtkWidget *tbl)
{
- prefs_set_double_attribute("tools.calligraphic", "width", adj->value);
+ prefs_set_double_attribute("tools.calligraphic", "width", adj->value * 0.01);
spinbutton_defocus(GTK_OBJECT(tbl));
}
{"mass", 0.02},
{"drag", 1.0},
{"angle", 30.0},
- {"width", 0.15},
+ {"width", 15},
{"thinning", 0.1},
{"tremor", 0.0},
{"flatness", 0.9}
/* Width */
{
GtkWidget *hb = sp_tb_spinbutton(_("Width:"), _("The width of the calligraphic pen (relative to the visible canvas area)"),
- "tools.calligraphic", "width", 0.15,
+ "tools.calligraphic", "width", 15,
NULL, tbl, TRUE, "altx-calligraphy",
- 0.01, 1.0, 0.01, 0.1,
- sp_ddc_width_value_changed, 0.01, 2);
+ 1, 100, 1.0, 10.0,
+ sp_ddc_width_value_changed, 0.01, 0, 100);
gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, AUX_SPACING);
}
/* Use Pressure button */
{
- GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR,
+ GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION,
SP_BUTTON_TYPE_TOGGLE,
NULL,
"use_pressure",
/* Use Tilt button */
{
- GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR,
+ GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION,
SP_BUTTON_TYPE_TOGGLE,
NULL,
"use_tilt",
gtk_box_pack_start(GTK_BOX(tbl),hb, FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS);
}
-/*
- // Tablet features
- {
- GtkWidget *hb = gtk_hbox_new(FALSE, 1);
- GtkWidget *fscb = gtk_check_button_new_with_label(_("Tablet"));
- gtk_widget_set_sensitive(GTK_WIDGET(fscb), TRUE);
-
-
-
-
- gtk_tooltips_set_tip(tt, fscb, _("Enable/Disable drawing tablet features"), NULL);
- gtk_widget_show(fscb);
- gtk_object_set_data(GTK_OBJECT(tbl), "flat_checkbox", fscb);
- gtk_container_add(GTK_CONTAINER(hb), fscb);
- gtk_box_pack_start(GTK_BOX(tbl),hb, FALSE, FALSE, AUX_SPACING);
- }
-*/
+ Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL);
+ swatch->setWatchedTool ("tools.calligraphic", true);
+ GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj());
+ gtk_box_pack_end(GTK_BOX(tbl), swatch_, FALSE, FALSE, 0);
gtk_widget_show_all(tbl);
sp_set_font_size_smaller (tbl);
@@ -2102,7 +2184,7 @@ sp_arctb_startend_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
prefs_set_double_attribute("tools.shapes.arc", value_name, (adj->value * M_PI)/ 180);
}
@@ -2117,7 +2199,7 @@ sp_arctb_startend_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const
gchar* namespaced_name = g_strconcat("sodipodi:", value_name, NULL);
bool modmade = false;
- for (GSList const *items = SP_DT_SELECTION(desktop)->itemList();
+ for (GSList const *items = sp_desktop_selection(desktop)->itemList();
items != NULL;
items = items->next)
{
@@ -2148,7 +2230,7 @@ sp_arctb_startend_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const
sp_arctb_sensitivize (tbl, adj->value, other->value);
if (modmade) {
- sp_document_maybe_done(SP_DT_DOCUMENT(desktop), value_name);
+ sp_document_maybe_done(sp_desktop_document(desktop), value_name);
}
// defocus spinbuttons by moving focus to the canvas, unless "stay" is on
{
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop");
- if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) {
+ if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) {
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
prefs_set_string_attribute("tools.shapes.arc", "open", "true");
} else {
bool modmade = false;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
- for (GSList const *items = SP_DT_SELECTION(desktop)->itemList();
+ for (GSList const *items = sp_desktop_selection(desktop)->itemList();
items != NULL;
items = items->next)
{
}
}
} else {
- for (GSList const *items = SP_DT_SELECTION(desktop)->itemList();
+ for (GSList const *items = sp_desktop_selection(desktop)->itemList();
items != NULL;
items = items->next)
{
}
if (modmade) {
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ sp_document_done(sp_desktop_document(desktop));
}
g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
@@ -2330,6 +2412,7 @@ sp_arc_toolbox_selection_changed(Inkscape::Selection *selection, GtkObject *tbl)
g_object_set_data(G_OBJECT(tbl), "repr", repr);
Inkscape::GC::anchor(repr);
sp_repr_add_listener(repr, &arc_tb_repr_events, tbl);
+ sp_repr_synthesize_events(repr, &arc_tb_repr_events, tbl);
}
} else {
// FIXME: implement averaging of all parameters for multiple selected
}
sigc::connection *connection = new sigc::connection(
- SP_DT_SELECTION(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_arc_toolbox_selection_changed), (GtkObject *)tbl))
+ sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_arc_toolbox_selection_changed), (GtkObject *)tbl))
);
g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), connection);
+ Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL);
+ swatch->setWatchedTool ("tools.shapes.arc", true);
+ GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj());
+ gtk_box_pack_end(GTK_BOX(tbl), swatch_, FALSE, FALSE, 0);
+
gtk_widget_show_all(tbl);
sp_set_font_size_smaller (tbl);
GtkWidget *hb = gtk_hbox_new(FALSE, 1);
GtkWidget *button =
- sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR,
+ sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION,
SP_BUTTON_TYPE_TOGGLE,
NULL,
"pick_color",
{
//Call back for letter rotation spinbutton
}*/
-static GtkWidget *
-sp_text_toolbox_new(SPDesktop *desktop)
-{
- GtkWidget *tbl = gtk_hbox_new(FALSE, 0);
-/* GtkWidget *us = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(tbl), "units");
- GtkTooltips *tt = gtk_tooltips_new();
- GtkWidget *group;
- //Font Family
+namespace {
+
+ void
+ sp_text_toolbox_selection_changed (Inkscape::Selection *selection, GObject *tbl)
+ {
+ GtkComboBox *cbox = 0;
+
+ SPStyle *query =
+ sp_style_new ();
+
+ int result_family =
+ sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTFAMILY);
+
+ int result_style =
+ sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTSTYLE);
+
+ int result_numbers =
+ sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTNUMBERS);
+
+ // If querying returned nothing, read the style from the text tool prefs (default style for new texts)
+ if (result_family == QUERY_STYLE_NOTHING || result_style == QUERY_STYLE_NOTHING || result_numbers == QUERY_STYLE_NOTHING)
{
- GtkWidget *c = gtk_combo_new ();
- gtk_combo_set_value_in_list ((GtkCombo *) c, FALSE, FALSE);
- gtk_combo_set_use_arrows ((GtkCombo *) c, TRUE);
- gtk_combo_set_use_arrows_always ((GtkCombo *) c, TRUE);
- gtk_widget_set_size_request (c, 144, -1);
- aux_toolbox_space(tbl, 1);
- gtk_box_pack_start (GTK_BOX (tbl), c, FALSE, FALSE, 0);
+ Inkscape::XML::Node *repr = inkscape_get_repr (INKSCAPE, "tools.text");
+
+ if (repr)
+ {
+ sp_style_read_from_repr (query, repr);
+ }
+ else
+ {
+ return;
+ }
}
- //Font Style
+ if (result_numbers == QUERY_STYLE_MULTIPLE_DIFFERENT)
{
- GtkWidget *c = gtk_combo_new ();
- gtk_combo_set_value_in_list ((GtkCombo *) c, FALSE, FALSE);
- gtk_combo_set_use_arrows ((GtkCombo *) c, TRUE);
- gtk_combo_set_use_arrows_always ((GtkCombo *) c, TRUE);
- gtk_widget_set_size_request (c, 88, -1);
- aux_toolbox_space(tbl, 1);
- gtk_box_pack_start (GTK_BOX (tbl), c, FALSE, FALSE, 0);
+ static char* cboxes[] = { "combo-box-family", "combo-box-style" };
+
+ for (unsigned n = 0 ; n < G_N_ELEMENTS(cboxes); ++n)
+ {
+ cbox = GTK_COMBO_BOX(g_object_get_data (G_OBJECT(tbl), cboxes[n]));
+ g_object_set_data (G_OBJECT (cbox), "block", GINT_TO_POINTER(1));
+ gtk_combo_box_set_active (GTK_COMBO_BOX (cbox), -1);
+ g_object_set_data (G_OBJECT (cbox), "block", GINT_TO_POINTER(0));
+ }
+ gtk_widget_hide (GTK_WIDGET (g_object_get_data (G_OBJECT(tbl), "warning-image")));
+ return;
}
- //Font Size
+ if (query->text)
{
- GtkWidget *c = gtk_combo_new ();
- gtk_combo_set_value_in_list ((GtkCombo *) c, FALSE, FALSE);
- gtk_combo_set_use_arrows ((GtkCombo *) c, TRUE);
- gtk_combo_set_use_arrows_always ((GtkCombo *) c, TRUE);
- gtk_widget_set_size_request (c, 64, -1);
- aux_toolbox_space(tbl, 1);
- gtk_box_pack_start (GTK_BOX (tbl), c, FALSE, FALSE, 0);
+ if (query->text->font_family.value)
+ {
+ Gtk::TreePath path;
+ try {
+ path = Inkscape::FontLister::get_instance()->get_row_for_font (query->text->font_family.value);
+ } catch (...) {
+ return;
+ }
+
+ cbox = GTK_COMBO_BOX(g_object_get_data (G_OBJECT(tbl), "combo-box-family"));
+ g_object_set_data (G_OBJECT (cbox), "block", GINT_TO_POINTER(1));
+ gtk_combo_box_set_active (GTK_COMBO_BOX (cbox), gtk_tree_path_get_indices (path.gobj())[0]);
+ g_object_set_data (G_OBJECT (cbox), "block", GINT_TO_POINTER(0));
+ }
+
+ //Style
+ cbox = GTK_COMBO_BOX(g_object_get_data (G_OBJECT(tbl), "combo-box-style"));
+ g_object_set_data (G_OBJECT (cbox), "block", GINT_TO_POINTER(1));
+ gtk_combo_box_set_active (GTK_COMBO_BOX (cbox), gint(query->font_style.value));
+ g_object_set_data (G_OBJECT (cbox), "block", GINT_TO_POINTER(0));
+
+ gtk_widget_hide (GTK_WIDGET (g_object_get_data (G_OBJECT(tbl), "warning-image")));
}
+ }
- aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS);
- //Bold
- {
- GtkWidget *px = gtk_image_new_from_stock(GTK_STOCK_BOLD, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
- GtkWidget *button = gtk_toggle_button_new ();
- gtk_container_add (GTK_CONTAINER (button), px);
- gtk_widget_show(button);
- gtk_tooltips_set_tip (tt, button, _("Bold"), NULL);
- gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
- gtk_widget_set_sensitive(button, TRUE);
- gtk_box_pack_start (GTK_BOX (tbl), button, FALSE, FALSE, 0);
+ void
+ sp_text_toolbox_selection_modified (Inkscape::Selection *selection, guint flags, GObject *tbl)
+ {
+ sp_text_toolbox_selection_changed (selection, tbl);
+ }
+
+ void
+ sp_text_toolbox_subselection_changed (gpointer dragger, GObject *tbl)
+ {
+ sp_text_toolbox_selection_changed (NULL, tbl);
+ }
+
+ void
+ sp_text_toolbox_family_changed (GtkComboBox *cbox,
+ GtkWidget *tbl)
+ {
+ SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+
+ if (GPOINTER_TO_INT(g_object_get_data (G_OBJECT (cbox), "block")) != 0) return;
+
+ if (gtk_combo_box_get_active (cbox) < 0) return;
+
+ SPCSSAttr *css = sp_repr_css_attr_new ();
+ sp_repr_css_set_property (css, "font-family", gtk_combo_box_get_active_text (cbox));
+ sp_desktop_set_style (desktop, css, true, true);
+ sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP));
+ sp_repr_css_attr_unref (css);
+
+ gtk_widget_hide (GTK_WIDGET (g_object_get_data (G_OBJECT(tbl), "warning-image")));
+ }
+
+ void
+ sp_text_toolbox_family_entry_activate (GtkEntry *entry,
+ GtkWidget *tbl)
+ {
+ const char* family = gtk_entry_get_text (entry);
+
+ try {
+ Gtk::TreePath path = Inkscape::FontLister::get_instance()->get_row_for_font (family);
+ GtkComboBox *cbox = GTK_COMBO_BOX(g_object_get_data (G_OBJECT(tbl), "combo-box-family"));
+ gtk_combo_box_set_active (cbox, gtk_tree_path_get_indices (path.gobj())[0]);
+ gtk_widget_hide (GTK_WIDGET (g_object_get_data (G_OBJECT(tbl), "warning-image")));
+ } catch (...) {
+ //XXX: Accept it anyway and show the warning
+ if (family && strlen (family)) gtk_widget_show_all (GTK_WIDGET (g_object_get_data (G_OBJECT(tbl), "warning-image")));
}
+ }
+
+ void
+ sp_text_toolbox_style_changed (GtkComboBox *cbox,
+ GtkWidget *tbl)
+ {
+ SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+
+ if (GPOINTER_TO_INT(g_object_get_data (G_OBJECT (cbox), "block")) != 0) return;
+
+ static char* styles[] = { "normal", "italic" , "oblique" };
+
+ SPCSSAttr *css = sp_repr_css_attr_new ();
+ sp_repr_css_set_property (css, "font-style", styles[gtk_combo_box_get_active (cbox)]);
+ sp_desktop_set_style (desktop, css, true, true);
+ sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP));
+ sp_repr_css_attr_unref (css);
+ }
+
+}//<unnamed> namespace
+
+#if 0
+static void cell_data_func (GtkCellLayout *cell_layout,
+ GtkCellRenderer *cell,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ char *text;
+ gtk_tree_model_get (tree_model, iter, 0, &text, -1);
+ g_object_set (G_OBJECT (cell), "family", text, NULL);
+}
+#endif
+
+namespace
+{
+ GtkWidget*
+ sp_text_toolbox_new (SPDesktop *desktop)
+ {
+ GtkWidget *tbl = gtk_hbox_new (FALSE, 0);
+
+#if 0
+ GtkWidget *us = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(tbl), "units"));
+ GtkTooltips *tt = gtk_tooltips_new();
+ GtkWidget *group;
+#endif
+
+ //Font Family
+ GtkWidget *cbox = gtk_combo_box_entry_new_text ();
+ Glib::RefPtr<Gtk::ListStore> store = Inkscape::FontLister::get_instance()->get_font_list();
+ gtk_cell_layout_clear (GTK_CELL_LAYOUT (cbox));
+ GtkCellRenderer *cell = gtk_cell_renderer_text_new ();
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (cbox), cell, FALSE);
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (cbox), cell, "text", 0, NULL);
+ GtkEntryCompletion *completion = gtk_entry_completion_new ();
+ gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (Glib::unwrap(store)));
+ gtk_entry_completion_set_text_column (completion, 0);
+ gtk_entry_completion_set_minimum_key_length (completion, 3); //3 characters minimum sounds reasonable
+ g_object_set (G_OBJECT(completion), "inline-completion", TRUE, "popup-completion", TRUE, NULL);
+
+#if 0
+ gtk_cell_layout_set_cell_data_func
+ (GTK_CELL_LAYOUT (cbox),
+ cell,
+ GtkCellLayoutDataFunc (cell_data_func),
+ tbl,
+ NULL);
+#endif
+
+ gtk_combo_box_set_model (GTK_COMBO_BOX (cbox), GTK_TREE_MODEL (Glib::unwrap(store)));
+ gtk_widget_set_size_request (cbox, 250, -1);
+ aux_toolbox_space (tbl, 1);
+ gtk_box_pack_start (GTK_BOX (tbl), cbox, FALSE, FALSE, 0);
+ g_object_set_data (G_OBJECT (tbl), "combo-box-family", cbox);
+ g_signal_connect (G_OBJECT (cbox), "changed", G_CALLBACK (sp_text_toolbox_family_changed), tbl);
+ g_signal_connect (G_OBJECT (GTK_BIN(cbox)->child), "activate", G_CALLBACK (sp_text_toolbox_family_entry_activate), tbl);
+ gtk_entry_set_completion (GTK_ENTRY(GTK_BIN(cbox)->child), completion);
+
+ GtkWidget *image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
+ aux_toolbox_space (tbl, 1);
+ GtkWidget *box = gtk_event_box_new ();
+ gtk_container_add (GTK_CONTAINER (box), image);
+ gtk_box_pack_start (GTK_BOX (tbl), box, FALSE, FALSE, 4);
+ g_object_set_data (G_OBJECT (tbl), "warning-image", box);
+ GtkTooltips *tooltips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (tooltips, box, _("This font is currently not installed on your system. Inkscape will use the default font instead."), "");
+ gtk_widget_hide (GTK_WIDGET (box));
+
+ //Font Style
+ cbox = gtk_combo_box_new_text ();
+ gtk_combo_box_append_text (GTK_COMBO_BOX (cbox), _("Normal"));
+ gtk_combo_box_append_text (GTK_COMBO_BOX (cbox), _("Italic"));
+ gtk_combo_box_append_text (GTK_COMBO_BOX (cbox), _("Oblique"));
+ gtk_widget_set_size_request (cbox, 144, -1);
+ aux_toolbox_space (tbl, 1);
+ gtk_box_pack_start (GTK_BOX (tbl), cbox, FALSE, FALSE, 0);
+ g_object_set_data (G_OBJECT (tbl), "combo-box-style", cbox);
+ g_signal_connect (G_OBJECT (cbox), "changed", G_CALLBACK (sp_text_toolbox_style_changed), tbl);
+
+ Inkscape::ConnectionPool* pool = Inkscape::ConnectionPool::new_connection_pool ("ISTextToolbox");
+
+ sigc::connection *c_selection_changed =
+ new sigc::connection (sp_desktop_selection (desktop)->connectChanged
+ (sigc::bind (sigc::ptr_fun (sp_text_toolbox_selection_changed), (GObject*)tbl)));
+ pool->add_connection ("selection-changed", c_selection_changed);
+
+ sigc::connection *c_selection_modified =
+ new sigc::connection (sp_desktop_selection (desktop)->connectModified
+ (sigc::bind (sigc::ptr_fun (sp_text_toolbox_selection_modified), (GObject*)tbl)));
+ pool->add_connection ("selection-modified", c_selection_modified);
+
+ sigc::connection *c_subselection_changed =
+ new sigc::connection (desktop->connectToolSubselectionChanged
+ (sigc::bind (sigc::ptr_fun (sp_text_toolbox_subselection_changed), (GObject*)tbl)));
+ pool->add_connection ("tool-subselection-changed", c_subselection_changed);
+
+ Inkscape::ConnectionPool::connect_destroy (G_OBJECT (tbl), pool);
+
+#if 0
+ //Font Size
+ {
+ GtkWidget *c = gtk_combo_new ();
+ gtk_combo_set_value_in_list ((GtkCombo *) c, FALSE, FALSE);
+ gtk_combo_set_use_arrows ((GtkCombo *) c, TRUE);
+ gtk_combo_set_use_arrows_always ((GtkCombo *) c, TRUE);
+ gtk_widget_set_size_request (c, 64, -1);
+ aux_toolbox_space(tbl, 1);
+ gtk_box_pack_start (GTK_BOX (tbl), c, FALSE, FALSE, 0);
+ }
+
+ aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS);
+ //Bold
+ {
+ GtkWidget *px = gtk_image_new_from_stock(GTK_STOCK_BOLD, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
+ GtkWidget *button = gtk_toggle_button_new ();
+ gtk_container_add (GTK_CONTAINER (button), px);
+ gtk_widget_show(button);
+ gtk_tooltips_set_tip (tt, button, _("Bold"), NULL);
+ gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+ gtk_widget_set_sensitive(button, TRUE);
+ gtk_box_pack_start (GTK_BOX (tbl), button, FALSE, FALSE, 0);
+ }
//Italic
{
- GtkWidget *px = gtk_image_new_from_stock(GTK_STOCK_ITALIC, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
- GtkWidget *button = gtk_toggle_button_new ();
- gtk_container_add (GTK_CONTAINER (button), px);
- gtk_widget_show(button);
- gtk_tooltips_set_tip (tt, button, _("Italics"), NULL);
- gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
- gtk_widget_set_sensitive(button, TRUE);
- gtk_box_pack_start (GTK_BOX (tbl), button, FALSE, FALSE, 0);
+ GtkWidget *px = gtk_image_new_from_stock(GTK_STOCK_ITALIC, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
+ GtkWidget *button = gtk_toggle_button_new ();
+ gtk_container_add (GTK_CONTAINER (button), px);
+ gtk_widget_show(button);
+ gtk_tooltips_set_tip (tt, button, _("Italics"), NULL);
+ gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+ gtk_widget_set_sensitive(button, TRUE);
+ gtk_box_pack_start (GTK_BOX (tbl), button, FALSE, FALSE, 0);
}
//Underline
{
- GtkWidget *px = gtk_image_new_from_stock(GTK_STOCK_UNDERLINE, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
- GtkWidget *button = gtk_toggle_button_new ();
- gtk_container_add (GTK_CONTAINER (button), px);
- gtk_widget_show(button);
- gtk_tooltips_set_tip (tt, button, _("Underline"), NULL);
- gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
- gtk_widget_set_sensitive(button, FALSE);
- gtk_box_pack_start (GTK_BOX (tbl), button, FALSE, FALSE, 0);
+ GtkWidget *px = gtk_image_new_from_stock(GTK_STOCK_UNDERLINE, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
+ GtkWidget *button = gtk_toggle_button_new ();
+ gtk_container_add (GTK_CONTAINER (button), px);
+ gtk_widget_show(button);
+ gtk_tooltips_set_tip (tt, button, _("Underline"), NULL);
+ gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+ gtk_widget_set_sensitive(button, FALSE);
+ gtk_box_pack_start (GTK_BOX (tbl), button, FALSE, FALSE, 0);
}
aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS);
// align left
{
- GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_LEFT, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
- GtkWidget *b = group = gtk_radio_button_new (NULL);
+ GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_LEFT, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
+ GtkWidget *b = group = gtk_radio_button_new (NULL);
gtk_container_add (GTK_CONTAINER (b), px);
- gtk_tooltips_set_tip (tt, b, _("Align lines left"), NULL);
- gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
- gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE );
- gtk_box_pack_start (GTK_BOX (tbl), b, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tt, b, _("Align lines left"), NULL);
+ gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
+ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE );
+ gtk_box_pack_start (GTK_BOX (tbl), b, FALSE, FALSE, 0);
}
// align center
{
- GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_CENTER, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
- GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group)));
+ GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_CENTER, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
+ GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group)));
gtk_container_add (GTK_CONTAINER (b), px);
- // TRANSLATORS: `Center' here is a verb.
- gtk_tooltips_set_tip (tt, b, _("Center lines"), NULL);
+ // TRANSLATORS: `Center' here is a verb.
+ gtk_tooltips_set_tip (tt, b, _("Center lines"), NULL);
gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
- gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE );
- gtk_box_pack_start (GTK_BOX (tbl), b, FALSE, FALSE, 0);
+ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE );
+ gtk_box_pack_start (GTK_BOX (tbl), b, FALSE, FALSE, 0);
}
// align right
{
- GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_RIGHT, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
- GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group)));
+ GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_RIGHT, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
+ GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group)));
gtk_container_add (GTK_CONTAINER (b), px);
- gtk_tooltips_set_tip (tt, b, _("Align lines right"), NULL);
- gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
- gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE );
- gtk_box_pack_start (GTK_BOX (tbl), b, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tt, b, _("Align lines right"), NULL);
+ gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
+ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE );
+ gtk_box_pack_start (GTK_BOX (tbl), b, FALSE, FALSE, 0);
}
// full justification
{
- GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
- GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group)));
+ GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, Inkscape::ICON_SIZE_SMALL_TOOLBAR);
+ GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group)));
gtk_container_add (GTK_CONTAINER (b), px);
- gtk_tooltips_set_tip (tt, b, _("Full justification"), NULL);
- gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
- gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE );
- gtk_box_pack_start (GTK_BOX (tbl), b, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tt, b, _("Full justification"), NULL);
+ gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
+ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE );
+ gtk_box_pack_start (GTK_BOX (tbl), b, FALSE, FALSE, 0);
}
gtk_widget_set_sensitive(button, TRUE);
gtk_box_pack_start (GTK_BOX (tbl), button, FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS);
}
+#endif
- gtk_widget_show_all(tbl);
- sp_set_font_size_smaller (tbl);
+ Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch(NULL);
+ swatch->setWatchedTool ("tools.text", true);
+ GtkWidget *swatch_ = GTK_WIDGET(swatch->gobj());
+ gtk_box_pack_end (GTK_BOX(tbl), swatch_, FALSE, FALSE, 0);
+ gtk_widget_show_all (tbl);
+
+ return tbl;
-*/ return tbl;
+ } // end of sp_text_toolbox_new()
-} // end of sp_text_toolbox_new()
+}//<unnamed> namespace
//#########################
SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl),
"desktop");
- SPDocument *doc = SP_DT_DOCUMENT(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
if (!sp_document_get_undo_sensitive(doc))
{
g_object_set_data(G_OBJECT(tbl), "repr", repr);
Inkscape::GC::anchor(repr);
sp_repr_add_listener(repr, &connector_tb_repr_events, tbl);
+ sp_repr_synthesize_events(repr, &connector_tb_repr_events, tbl);
}
return tbl;