← Back to branch summary

~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu4

« back to all changes in this revision

Viewing changes to src/ui/dialog/fill-and-stroke.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook, Ted Gould, Kees Cook
  • Date: 2009-06-24 14:00:43 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090624140043-07stp20mry48hqup
Tags: 0.47~pre0-0ubuntu1
* New upstream release

[ Ted Gould ]
* debian/control: Adding libgsl0 and removing version specifics on boost

[ Kees Cook ]
* debian/watch: updated to run uupdate and mangle pre-release versions.
* Dropped patches that have been taken upstream:
  - 01_mips
  - 02-poppler-0.8.3
  - 03-chinese-inkscape
  - 05_fix_latex_patch
  - 06_gcc-4.4
  - 07_cdr2svg
  - 08_skip-bad-utf-on-pdf-import
  - 09_gtk-clist
  - 10_belarussian
  - 11_libpng
  - 12_desktop
  - 13_slider
  - 100_svg_import_improvements
  - 102_sp_pattern_painter_free
  - 103_bitmap_type_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ui/dialog/fill-and-stroke.cpp
1
 
/**
2
 
 * \brief Fill and Stroke dialog,
3
 
 * based on sp_object_properties_dialog
 
1
/** @file
 
2
 * @brief Fill and Stroke dialog - implementation
4
3
 *
5
 
 * Authors:
 
4
 * Based on the old sp_object_properties_dialog.
 
5
 */
 
6
/* Authors:
6
7
 *   Bryce W. Harrington <bryce@bryceharrington.org>
7
8
 *   Gustav Broberg <broberg@kth.se>
8
9
 *
11
12
 * Released under GNU GPL.  Read the file 'COPYING' for more information.
12
13
 */
13
14
 
14
 
#ifdef HAVE_CONFIG_H
15
 
# include <config.h>
16
 
#endif
17
 
 
18
15
#include "desktop-handles.h"
19
16
#include "desktop-style.h"
20
17
#include "document.h"
21
18
#include "fill-and-stroke.h"
22
19
#include "filter-chemistry.h"
23
20
#include "inkscape.h"
24
 
#include "inkscape-stock.h"
25
21
#include "selection.h"
26
22
#include "style.h"
27
23
#include "svg/css-ostringstream.h"
 
24
#include "ui/icon-names.h"
28
25
#include "verbs.h"
 
26
#include "widgets/fill-style.h"
 
27
#include "widgets/icon.h"
 
28
#include "widgets/paint-selector.h"
 
29
#include "widgets/stroke-style.h"
29
30
#include "xml/repr.h"
30
 
#include "widgets/icon.h"
31
 
 
32
 
#include "dialogs/fill-style.h"
33
 
#include "dialogs/stroke-style.h"
34
 
 
35
 
#include <widgets/paint-selector.h>
36
31
 
37
32
namespace Inkscape {
38
33
namespace UI {
39
34
namespace Dialog {
40
35
 
41
36
FillAndStroke::FillAndStroke()
42
 
    : UI::Widget::Panel ("", "dialogs.fillstroke", SP_VERB_DIALOG_FILL_STROKE),
 
37
    : UI::Widget::Panel ("", "/dialogs/fillstroke", SP_VERB_DIALOG_FILL_STROKE),
43
38
      _page_fill(1, 1, true, true),
44
39
      _page_stroke_paint(1, 1, true, true),
45
40
      _page_stroke_style(1, 1, true, true),
50
45
 
51
46
    contents->pack_start(_notebook, true, true);
52
47
 
53
 
    _notebook.append_page(_page_fill, _createPageTabLabel(_("Fill"), INKSCAPE_STOCK_PROPERTIES_FILL_PAGE));
54
 
    _notebook.append_page(_page_stroke_paint, _createPageTabLabel(_("Stroke _paint"), INKSCAPE_STOCK_PROPERTIES_STROKE_PAINT_PAGE));
55
 
    _notebook.append_page(_page_stroke_style, _createPageTabLabel(_("Stroke st_yle"), INKSCAPE_STOCK_PROPERTIES_STROKE_PAGE));
 
48
    _notebook.append_page(_page_fill, _createPageTabLabel(_("Fill"), INKSCAPE_ICON_OBJECT_FILL));
 
49
    _notebook.append_page(_page_stroke_paint, _createPageTabLabel(_("Stroke _paint"), INKSCAPE_ICON_OBJECT_STROKE));
 
50
    _notebook.append_page(_page_stroke_style, _createPageTabLabel(_("Stroke st_yle"), INKSCAPE_ICON_OBJECT_STROKE_STYLE));
56
51
 
57
52
    _layoutPageFill();
58
53
    _layoutPageStrokePaint();
87
82
void
88
83
FillAndStroke::_layoutPageStrokeStyle()
89
84
{
90
 
    Gtk::Widget *ssl = manage(Glib::wrap(sp_stroke_style_line_widget_new()));
 
85
    //Gtk::Widget *ssl = manage(Glib::wrap(sp_stroke_style_line_widget_new()));
 
86
    //Gtk::Widget *ssl = static_cast<Gtk::Widget *>(sp_stroke_style_line_widget_new());
 
87
    Gtk::Widget *ssl = sp_stroke_style_line_widget_new();
91
88
    _page_stroke_style.table().attach(*ssl, 0, 1, 0, 1);
92
89
}
93
90