diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-03-26 00:32:53 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-03-26 00:32:53 +0000 |
| commit | 3b3b093c2e1d5c102aecd6033d47544db21789b3 (patch) | |
| tree | c790691ee37067f4eaee1c50fa80614fabca23a3 /src/extension | |
| parent | ADD POTFILES skip (diff) | |
| parent | Drop unnecessary (and broken with Gtk+ 3) check for Gtk+ backend (diff) | |
| download | inkscape-3b3b093c2e1d5c102aecd6033d47544db21789b3.tar.gz inkscape-3b3b093c2e1d5c102aecd6033d47544db21789b3.zip | |
Update to trunk
(bzr r11950.1.75)
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/error-file.cpp | 5 | ||||
| -rw-r--r-- | src/extension/extension.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/cairo-ps-out.cpp | 8 | ||||
| -rw-r--r-- | src/extension/internal/cairo-renderer-pdf-out.cpp | 4 | ||||
| -rw-r--r-- | src/extension/param/string.cpp | 3 | ||||
| -rw-r--r-- | src/extension/prefdialog.h | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp index 778295f47..5a8bede70 100644 --- a/src/extension/error-file.cpp +++ b/src/extension/error-file.cpp @@ -12,12 +12,11 @@ #include "config.h" #endif -#include <glibmm/i18n.h> - +#include "ui/dialog/extensions.h" +#include <glibmm/i18n.h> #include "inkscape.h" #include "preferences.h" -#include "ui/dialog/extensions.h" #include "extension/extension.h" #include "error-file.h" diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp index 28f556e75..f9cf70960 100644 --- a/src/extension/extension.cpp +++ b/src/extension/extension.cpp @@ -19,7 +19,6 @@ # include "config.h" #endif -#include <glibmm/i18n.h> #include <gtkmm/box.h> #include <gtkmm/label.h> #include <gtkmm/frame.h> @@ -30,6 +29,7 @@ # include <gtkmm/table.h> #endif +#include <glibmm/i18n.h> #include "inkscape.h" #include "extension/implementation/implementation.h" #include "extension.h" diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp index 8a39f4ea9..983c9dfb5 100644 --- a/src/extension/internal/cairo-ps-out.cpp +++ b/src/extension/internal/cairo-ps-out.cpp @@ -319,8 +319,8 @@ CairoPsOutput::init (void) "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n" "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n" "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n" - "<option value=\"page\">" N_("Use document's page size") "</option>" - "<option value=\"drawing\">" N_("Use exported object's size") "</option>" + "<_option value=\"page\">" N_("Use document's page size") "</_option>" + "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>" "</param>" "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n" "<output>\n" @@ -359,8 +359,8 @@ CairoEpsOutput::init (void) "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n" "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n" "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n" - "<option value=\"page\">" N_("Use document's page size") "</option>" - "<option value=\"drawing\">" N_("Use exported object's size") "</option>" + "<_option value=\"page\">" N_("Use document's page size") "</_option>" + "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>" "</param>" "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n" "<output>\n" diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp index 773109c77..63e46ad17 100644 --- a/src/extension/internal/cairo-renderer-pdf-out.cpp +++ b/src/extension/internal/cairo-renderer-pdf-out.cpp @@ -252,8 +252,8 @@ CairoRendererPdfOutput::init (void) "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n" "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n" "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n" - "<option value=\"page\">" N_("Use document's page size") "</option>" - "<option value=\"drawing\">" N_("Use exported object's size") "</option>" + "<_option value=\"page\">" N_("Use document's page size") "</_option>" + "<_option value=\"drawing\">" N_("Use exported object's size") "</_option>" "</param>" "<param name=\"bleed\" gui-text=\"" N_("Bleed/margin (mm)") "\" type=\"float\" min=\"-10000\" max=\"10000\">0</param>\n" "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n" diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp index 2020fb24d..4e525ff73 100644 --- a/src/extension/param/string.cpp +++ b/src/extension/param/string.cpp @@ -10,11 +10,12 @@ # include "config.h" #endif -#include <glibmm/value.h> #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/spinbutton.h> +#include <glibmm/value.h> + #include "xml/node.h" #include "extension/extension.h" #include "string.h" diff --git a/src/extension/prefdialog.h b/src/extension/prefdialog.h index 943273623..e1999791f 100644 --- a/src/extension/prefdialog.h +++ b/src/extension/prefdialog.h @@ -10,8 +10,8 @@ #ifndef INKSCAPE_EXTENSION_DIALOG_H__ #define INKSCAPE_EXTENSION_DIALOG_H__ -#include <glibmm/value.h> #include <gtkmm/dialog.h> +#include <glibmm/value.h> #include <glibmm/ustring.h> |