← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/ui/dialog/layers.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/layers.h
4
4
 * Authors:
5
5
 *   Jon A. Cruz
6
6
 *
7
 
 * Copyright (C) 2006 Jon A. Cruz
 
7
 * Copyright (C) 2006,2010 Jon A. Cruz
8
8
 *
9
9
 * Released under GNU GPL, read the file 'COPYING' for more information
10
10
 */
25
25
//#include "ui/previewholder.h"
26
26
#include "ui/widget/panel.h"
27
27
#include "ui/widget/object-composite-settings.h"
 
28
#include "desktop-tracker.h"
28
29
 
29
30
class SPObject;
30
31
 
33
34
class LayerManager;
34
35
 
35
36
namespace UI {
36
 
namespace Dialogs {
 
37
namespace Dialog {
37
38
 
38
39
 
39
40
/**
46
47
    virtual ~LayersPanel();
47
48
 
48
49
    //virtual void setOrientation( Gtk::AnchorType how );
49
 
    
 
50
 
50
51
    static LayersPanel& getInstance();
51
52
 
52
53
    void setDesktop( SPDesktop* desktop );
100
101
    // Internal
101
102
    sigc::connection _selectedConnection;
102
103
 
 
104
    DesktopTracker deskTrack;
103
105
    int _maxNestDepth;
104
 
    Inkscape::LayerManager* _mgr;
105
106
    SPDesktop* _desktop;
106
107
    ModelColumns* _model;
107
108
    InternalUIBounce* _pending;
121
122
 
122
123
    UI::Widget::StyleSubject::CurrentLayer _subject;
123
124
    UI::Widget::ObjectCompositeSettings _compositeSettings;
 
125
    sigc::connection desktopChangeConn;
124
126
};
125
127
 
126
128