diff options
| author | Slagvi Public <JandotDarowskiattgmaildottcom> | 2013-09-21 21:32:09 +0000 |
|---|---|---|
| committer | Slagvi Public <JandotDarowskiattgmaildottcom> | 2013-09-21 21:32:09 +0000 |
| commit | 8921f8000318d636ae8ce2a1198f92161f1dba9f (patch) | |
| tree | 30f6ae8eb49e3d8cd06e4f5778a67ff227a88360 /src | |
| parent | Fix Empty Page xml namespace. (diff) | |
| download | inkscape-8921f8000318d636ae8ce2a1198f92161f1dba9f.tar.gz inkscape-8921f8000318d636ae8ce2a1198f92161f1dba9f.zip | |
Small style fixes.
(bzr r12481.1.15)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/template-load-tab.cpp | 8 | ||||
| -rw-r--r-- | src/ui/dialog/template-widget.cpp | 6 | ||||
| -rw-r--r-- | src/ui/dialog/template-widget.h | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp index 4517c4472..8e33cf503 100644 --- a/src/ui/dialog/template-load-tab.cpp +++ b/src/ui/dialog/template-load-tab.cpp @@ -18,19 +18,19 @@ #include <glibmm/fileutils.h> #include <glibmm/miscutils.h> #include <glibmm/stringutils.h> -#include <list> #include <iostream> +#include <list> +#include "extension/db.h" +#include "extension/effect.h" +#include "inkscape.h" #include "interface.h" #include "file.h" #include "path-prefix.h" #include "preferences.h" -#include "inkscape.h" #include "xml/repr.h" #include "xml/document.h" #include "xml/node.h" -#include "extension/db.h" -#include "extension/effect.h" namespace Inkscape { diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp index 916d968ec..ef022c421 100644 --- a/src/ui/dialog/template-widget.cpp +++ b/src/ui/dialog/template-widget.cpp @@ -35,19 +35,16 @@ namespace UI { TemplateWidget::TemplateWidget() : _more_info_button(_("More info")) , _short_description_label(_(" ")) - , _template_author_label(_(" ")) , _template_name_label(_("no template selected")) , _effect_prefs(NULL) { pack_start(_template_name_label, Gtk::PACK_SHRINK, 10); - pack_start(_template_author_label, Gtk::PACK_SHRINK, 0); pack_start(_preview_box, Gtk::PACK_SHRINK, 0); _preview_box.pack_start(_preview_image, Gtk::PACK_EXPAND_PADDING, 15); _preview_box.pack_start(_preview_render, Gtk::PACK_EXPAND_PADDING, 10); _short_description_label.set_line_wrap(true); - //_short_description_label.set_size_request(200); Gtk::Alignment *align; align = manage(new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0)); @@ -83,7 +80,6 @@ void TemplateWidget::display(TemplateLoadTab::TemplateData data) _current_template = data; _template_name_label.set_text(_current_template.display_name); - // _template_author_label.set_text(_current_template.author); _short_description_label.set_text(_current_template.short_description); _preview_render.hide(); @@ -105,7 +101,7 @@ void TemplateWidget::display(TemplateLoadTab::TemplateData data) _effect_prefs = NULL; } if (data.is_procedural){ - _effect_prefs = data.tpl_effect->get_imp()->prefs_effect(data.tpl_effect, SP_ACTIVE_DESKTOP, NULL, NULL); // SP_ACTIVE_DESKTOP? + _effect_prefs = data.tpl_effect->get_imp()->prefs_effect(data.tpl_effect, SP_ACTIVE_DESKTOP, NULL, NULL); pack_start(*_effect_prefs); } } diff --git a/src/ui/dialog/template-widget.h b/src/ui/dialog/template-widget.h index a41a14a38..bb35d26a0 100644 --- a/src/ui/dialog/template-widget.h +++ b/src/ui/dialog/template-widget.h @@ -17,6 +17,7 @@ #include "template-load-tab.h" + namespace Inkscape { namespace UI { @@ -36,7 +37,6 @@ private: Gtk::Image _preview_image; Dialog::SVGPreview _preview_render; Gtk::Label _short_description_label; - Gtk::Label _template_author_label; Gtk::Label _template_name_label; Gtk::Widget *_effect_prefs; |
