summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 115638a)
raw | patch | inline | side by side (parent: 115638a)
author | joncruz <joncruz@users.sourceforge.net> | |
Sat, 8 Dec 2007 07:06:18 +0000 (07:06 +0000) | ||
committer | joncruz <joncruz@users.sourceforge.net> | |
Sat, 8 Dec 2007 07:06:18 +0000 (07:06 +0000) |
src/display/nr-filter-turbulence.cpp | patch | blob | history | |
src/sp-metadata.cpp | patch | blob | history | |
src/ui/dialog/messages.cpp | patch | blob | history | |
src/widgets/toolbox.cpp | patch | blob | history |
index 869c66fcfb2f029e587ea62bba928f1fb0c3277b..8d3bc290c32ab380d7d773b08606a1201ce29db0 100644 (file)
updated=u;
}
-void FilterTurbulence::update_pixbuffer(FilterSlot &slot, IRect &area) {
+void FilterTurbulence::update_pixbuffer(FilterSlot &/*slot*/, IRect &area) {
//g_warning("update_pixbuf");
int bbox_x0 = area.min()[X];
int bbox_y0 = area.min()[Y];
diff --git a/src/sp-metadata.cpp b/src/sp-metadata.cpp
index 11bc994f7402d3fee63f916d96d3c9f6fa3d3002..9fb67feb41048b395c356da9f46e967b05a4b314 100644 (file)
--- a/src/sp-metadata.cpp
+++ b/src/sp-metadata.cpp
static void
sp_metadata_init (SPMetadata *metadata)
{
+ (void)metadata;
debug("0x%08x",(unsigned int)metadata);
}
index 43f80ab65482fc86af6646469b32650e4390ed2a..31bec26a7760a7f0d19d1487155350e4bb7c0cbb 100644 (file)
}
-void dialogLoggingFunction(const gchar *log_domain,
- GLogLevelFlags log_level,
+void dialogLoggingFunction(const gchar */*log_domain*/,
+ GLogLevelFlags /*log_level*/,
const gchar *messageText,
gpointer user_data)
{
index 9d57dfb5a5e6f15a16a5c87d75b68abbef2bb6be..47cb78cb22d21ad91f6f158c5688f584bda645a2 100644 (file)
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
Inkscape::ConnectionPool::connect_destroy (G_OBJECT (tbl), pool);
-#if 0
- // horizontal
- {
- GtkWidget *px= sp_icon_new(Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_WRITING_MODE_LR);
- GtkWidget *b = group = gtk_radio_button_new (NULL);
- gtk_container_add (GTK_CONTAINER (b), px);
- gtk_tooltips_set_tip (tt, b, _("Horizontal text"), 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);
- }
-
- // vertical
- {
- GtkWidget *px = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_WRITING_MODE_TB);
- 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, _("Vertical text"), 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);
- }
-
- aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS);
-
- // letter spacing
- {
- {
- GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_LETTER_SPACING);
- GtkWidget *hb = gtk_hbox_new(FALSE, 1);
- gtk_container_add (GTK_CONTAINER (hb), image);
- gtk_widget_show(image);
- gtk_box_pack_start (GTK_BOX (tbl), hb, FALSE, FALSE, 0);
- }
-
- {
- GtkWidget *hb = sp_tb_spinbutton((""), _("Spacing between letters"),
- "tools.text", "letter_spacing", 0.0,
- us, tbl, FALSE, NULL,
- -1000.0, 1000.0, 0.1, 0.1,
- sp_text_letter_changed, 0.1, 1);
- gtk_widget_set_size_request (hb, 45, 6);
- gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, 6);
- }
- }
-
- // line spacing
- {
- {
- GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_LINE_SPACING);
- GtkWidget *hb = gtk_hbox_new(FALSE, 1);
- gtk_container_add (GTK_CONTAINER (hb), image);
- gtk_widget_show(image);
- gtk_box_pack_start (GTK_BOX (tbl), hb, FALSE, FALSE, 0);
- }
-
- {
- GtkWidget *hb = sp_tb_spinbutton((""), _("Spacing between lines"),
- "tools.text", "line_spacing", 0,
- us, tbl, FALSE, NULL,
- -1000.0, 1000.0, 0.1, 0.1,
- sp_text_line_changed, 0.1, 1);
- gtk_widget_set_size_request (hb, 45, 0);
- gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, 3);
- }
- }
-
- {
- // horizontal kerning/vertical kerning units menu: create
- GtkWidget *us = sp_unit_selector_new(SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE);
- sp_unit_selector_setsize(us, AUX_OPTION_MENU_WIDTH, AUX_OPTION_MENU_HEIGHT);
- sp_unit_selector_set_unit(SP_UNIT_SELECTOR(us), desktop->namedview->doc_units);
-
- aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS);
-
- // horizontal kerning
- {
- {
- GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_HORZ_KERN);
- GtkWidget *hb = gtk_hbox_new(FALSE, 1);
- gtk_container_add (GTK_CONTAINER (hb), image);
- gtk_widget_show(image);
- gtk_box_pack_start (GTK_BOX (tbl), hb, FALSE, FALSE, 0);
- }
-
- {
- GtkWidget *hb = sp_tb_spinbutton((""), _("Horizontal kerning"),
- "tools.text", "horizontal_kerning", 0,
- us, tbl, FALSE, NULL,
- -100.00, 100.00, 0.01, 0.1,
- sp_text_horiz_kern_changed);
- gtk_widget_set_size_request (hb, 45, 0);
- gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, 6);
- }
- }
-
- // vertical kerning
- {
- {
- GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_VERT_KERN);
- GtkWidget *hb = gtk_hbox_new(FALSE, 1);
- gtk_container_add (GTK_CONTAINER (hb), image);
- gtk_widget_show(image);
- gtk_box_pack_start (GTK_BOX (tbl), hb, FALSE, FALSE, 0);
- }
-
- {
- GtkWidget *hb = sp_tb_spinbutton((""), _("Vertical kerning"),
- "tools.text", "vertical_kerning", 0,
- us, tbl, FALSE, NULL,
- -100.00, 100.00, 0.01, 0.1,
- sp_text_vert_kern_changed);
- gtk_widget_set_size_request (hb, 45, 0);
- gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, 5);
- }
- }
-
- // add the units menu
- gtk_widget_show(us);
- gtk_box_pack_start(GTK_BOX(tbl), us, FALSE, FALSE, 1);
- gtk_object_set_data(GTK_OBJECT(tbl), "units", us);
- }
-
- // letter rotation
- aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS);
- {
- {
- GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_ROTATION);
- GtkWidget *hb = gtk_hbox_new(FALSE, 1);
- gtk_container_add (GTK_CONTAINER (hb), image);
- gtk_widget_show(image);
- gtk_box_pack_start (GTK_BOX (tbl), hb, FALSE, FALSE, 0);
- }
- {
- GtkWidget *hb = sp_tb_spinbutton((""), _("Letter rotation"),
- "tools.text", "letter_rotation", 0,
- us, tbl, FALSE, NULL,
- -180.0, 180.0, 0.1, 0.1,
- sp_text_letter_rotation_changed, 0.1, 1);
- gtk_widget_set_size_request (hb, 45, 0);
- gtk_box_pack_start(GTK_BOX(tbl), hb, FALSE, FALSE, 6);
- }
- // rotation degree label
- {
- GtkWidget *label = gtk_widget_new (GTK_TYPE_LABEL, "label", "\302\260", "xalign", 0.0, NULL);
- gtk_box_pack_start(GTK_BOX(tbl), label, FALSE, FALSE, 0);
- }
- }
-
- // Remove Manual Kerns
- {
- GtkWidget *px = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_REMOVE_KERNS);
- GtkWidget *button = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER (button), px);
- gtk_widget_show(button);
- gtk_tooltips_set_tip (tt, button, _("Remove manual kerns"), 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, AUX_BETWEEN_BUTTON_GROUPS);
- }
-#endif
-
gtk_widget_show_all (tbl);
return tbl;