From 85532ea2a4e6e9bb36ed4cf6fceab491a13a5711 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 19 Feb 2013 22:26:55 +1100 Subject: update cmake files (bzr r12134) --- src/ui/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/ui') diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 8fd8eb4e3..f3c3b8473 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -84,6 +84,7 @@ set(ui_SRC widget/entry.cpp widget/filter-effect-chooser.cpp widget/frame.cpp + widget/gimpcolorwheel.c widget/gimpspinscale.c widget/imageicon.cpp widget/imagetoggler.cpp @@ -212,6 +213,7 @@ set(ui_SRC widget/filter-effect-chooser.h widget/frame.h widget/gimpspinscale.h + widget/gimpcolorwheel.h widget/imageicon.h widget/imagetoggler.h widget/labelled.h -- cgit v1.2.3 From f443bdd6b8ffbba754f62e683ef3f9267c27794a Mon Sep 17 00:00:00 2001 From: su_v Date: Wed, 20 Feb 2013 08:06:48 +0100 Subject: Bug 1111459: revert changes from r12012 (regressions affect normal usage more than the problem fixed with r12012 (bug #1089406) (bzr r12137) --- src/ui/dialog/filter-effects-dialog.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/ui') diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index 50f30e8f4..ec82260d2 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -1201,7 +1201,6 @@ void FilterEffectsDialog::FilterModifier::on_change_selection() { Inkscape::Selection *selection = sp_desktop_selection (SP_ACTIVE_DESKTOP); update_selection(selection); - update_filters(); } void FilterEffectsDialog::FilterModifier::on_modified_selection( guint flags ) -- cgit v1.2.3 From ea952687e7b1ae64c4c30c8eb66bd875d75fec2d Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 23 Feb 2013 13:57:26 +0000 Subject: Fix missing headers for Gtk+ 3 build Fixed bugs: - https://launchpad.net/bugs/1122816 (bzr r12145) --- src/ui/dialog/floating-behavior.cpp | 1 + src/ui/dialog/font-substitution.cpp | 2 ++ src/ui/dialog/inkscape-preferences.cpp | 1 + src/ui/dialog/layers.cpp | 1 + src/ui/dialog/swatches.cpp | 1 + src/ui/widget/dock-item.cpp | 1 + 6 files changed, 7 insertions(+) (limited to 'src/ui') diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp index ba81c6d47..eab5f9d8f 100644 --- a/src/ui/dialog/floating-behavior.cpp +++ b/src/ui/dialog/floating-behavior.cpp @@ -12,6 +12,7 @@ #include #include +#include #include #include "floating-behavior.h" diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp index 07e73cec8..f0112f1d8 100644 --- a/src/ui/dialog/font-substitution.cpp +++ b/src/ui/dialog/font-substitution.cpp @@ -37,6 +37,8 @@ #include "libnrtype/FontFactory.h" #include "libnrtype/font-instance.h" +#include + namespace Inkscape { namespace UI { namespace Dialog { diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 57f815730..d6c1390d2 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -18,6 +18,7 @@ #endif #include +#include #include "inkscape-preferences.h" #include diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index fdc33b2a6..dd147d00f 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -20,6 +20,7 @@ #include #include +#include #include "desktop.h" #include "desktop-style.h" diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index 43b88e5c6..71fee342a 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -23,6 +23,7 @@ #include #include +#include #include #include "color-item.h" diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp index b9cc50845..8d960ddc3 100644 --- a/src/ui/widget/dock-item.cpp +++ b/src/ui/widget/dock-item.cpp @@ -18,6 +18,7 @@ #include #include +#include namespace Inkscape { namespace UI { -- cgit v1.2.3 From 2826aeaaef1d5f13f850a4b8e5dee23d0ae3d11b Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 25 Feb 2013 22:04:52 +0100 Subject: Some strings clarifications (see Bug #955060, Latvian translation for 0.49). (bzr r12153) --- src/ui/dialog/filter-effects-dialog.cpp | 2 +- src/ui/dialog/inkscape-preferences.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ui') diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index ec82260d2..7dc94c92f 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -2667,7 +2667,7 @@ void FilterEffectsDialog::update_primitive_infobox() break; case(NR_FILTER_SPECULARLIGHTING): _infobox_icon.set_from_icon_name("feSpecularLighting-icon", Gtk::ICON_SIZE_DIALOG); - _infobox_desc.set_markup(_("The feDiffuseLighting and feSpecularLighting filter primitives create \"embossed\" shadings. The input's alpha channel is used to provide depth information: higher opacity areas are raised toward the viewer and lower opacity areas recede away from the viewer.")); + _infobox_desc.set_markup(_("The feDiffuseLighting and feSpecularLighting filter primitives create \"embossed\" shadings. The input's alpha channel is used to provide depth information: higher opacity areas are raised toward the viewer and lower opacity areas recede away from the viewer.")); break; case(NR_FILTER_TILE): _infobox_icon.set_from_icon_name("feTile-icon", Gtk::ICON_SIZE_DIALOG); diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index d6c1390d2..c162681e7 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -1289,7 +1289,7 @@ void InkscapePreferences::initPageBehavior() _page_mask.add_group_header( _("Before applying")); _mask_grouping_none.init( _("Do not group clipped/masked objects"), "/options/maskobject/grouping", PREFS_MASKOBJECT_GROUPING_NONE, true, 0); - _mask_grouping_separate.init( _("Enclose every clipped/masked object in its own group"), "/options/maskobject/grouping", PREFS_MASKOBJECT_GROUPING_SEPARATE, false, &_mask_grouping_none); + _mask_grouping_separate.init( _("Put every clipped/masked object in its own group"), "/options/maskobject/grouping", PREFS_MASKOBJECT_GROUPING_SEPARATE, false, &_mask_grouping_none); _mask_grouping_all.init( _("Put all clipped/masked objects into one group"), "/options/maskobject/grouping", PREFS_MASKOBJECT_GROUPING_ALL, false, &_mask_grouping_none); _page_mask.add_line(true, "", _mask_grouping_none, "", -- cgit v1.2.3