← Back to branch summary

~ubuntu-branches/ubuntu/utopic/inkscape/utopic-proposed

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Alex Valavanis
  • Date: 2010-09-12 19:44:58 UTC
  • mfrom: (1.1.12 upstream) (45.1.3 maverick)
  • Revision ID: james.westby@ubuntu.com-20100912194458-4sjwmbl7dlsrk5dc
Tags: 0.48.0-1ubuntu1
https://launchpad.net/bugs/628048
https://launchpad.net/bugs/401567
https://launchpad.net/bugs/456248
https://launchpad.net/bugs/463602
https://launchpad.net/bugs/591986
https://launchpad.net/bugs/513319
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248, 
  LP: #463602, LP: #591986)
* debian/control: 
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
  - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
  - Add usr/share/pixmaps.  Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ui/dialog/fill-and-stroke.h
4
4
/* Authors:
5
5
 *   Bryce W. Harrington <bryce@bryceharrington.org>
6
6
 *   Gustav Broberg <broberg@kth.se>
 
7
 *   Jon A. Cruz <jon@joncruz.org>
7
8
 *
8
9
 * Copyright (C) 2004--2007 Authors
 
10
 * Copyright (C) 2010 Jon A. Cruz
9
11
 *
10
12
 * Released under GNU GPL.  Read the file 'COPYING' for more information.
11
13
 */
23
25
#include "ui/widget/panel.h"
24
26
#include "ui/widget/notebook-page.h"
25
27
#include "ui/widget/object-composite-settings.h"
26
 
 
27
 
using namespace Inkscape::UI::Widget;
 
28
#include "ui/dialog/desktop-tracker.h"
28
29
 
29
30
namespace Inkscape {
30
31
namespace UI {
37
38
 
38
39
    static FillAndStroke &getInstance() { return *new FillAndStroke(); }
39
40
 
 
41
 
 
42
    virtual void setDesktop(SPDesktop *desktop);
 
43
 
40
44
    void selectionChanged(Inkscape::Application *inkscape,
41
45
                          Inkscape::Selection *selection);
42
46
 
47
51
protected:
48
52
    Gtk::Notebook   _notebook;
49
53
 
50
 
    NotebookPage    _page_fill;
51
 
    NotebookPage    _page_stroke_paint;
52
 
    NotebookPage    _page_stroke_style;
53
 
 
54
 
    StyleSubject::Selection _subject;
55
 
    ObjectCompositeSettings _composite_settings;
56
 
 
57
 
    Gtk::HBox &_createPageTabLabel(const Glib::ustring &label, 
 
54
    UI::Widget::NotebookPage    _page_fill;
 
55
    UI::Widget::NotebookPage    _page_stroke_paint;
 
56
    UI::Widget::NotebookPage    _page_stroke_style;
 
57
 
 
58
    UI::Widget::StyleSubject::Selection _subject;
 
59
    UI::Widget::ObjectCompositeSettings _composite_settings;
 
60
 
 
61
    Gtk::HBox &_createPageTabLabel(const Glib::ustring &label,
58
62
                                   const char *label_image);
59
63
 
60
64
    void _layoutPageFill();
64
68
private:
65
69
    FillAndStroke(FillAndStroke const &d);
66
70
    FillAndStroke& operator=(FillAndStroke const &d);
 
71
 
 
72
    void setTargetDesktop(SPDesktop *desktop);
 
73
 
 
74
    DesktopTracker deskTrack;
 
75
    SPDesktop *targetDesktop;
 
76
    Gtk::Widget *fillWdgt;
 
77
    Gtk::Widget *strokeWdgt;
 
78
    sigc::connection desktopChangeConn;
67
79
};
68
80
 
69
81
} // namespace Dialog
70
82
} // namespace UI
71
83
} // namespace Inkscape
72
84
 
 
85
 
73
86
#endif // INKSCAPE_UI_DIALOG_FILL_AND_STROKE_H
74
87
 
75
88
/*