← Back to branch summary

~ubuntu-branches/ubuntu/precise/inkscape/precise-updates

« back to all changes in this revision

Viewing changes to src/ui/dialog/document-metadata.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/document-metadata.h
23
23
#include "ui/widget/notebook-page.h"
24
24
#include "ui/widget/registry.h"
25
25
 
26
 
using namespace Inkscape::UI::Widget;
27
 
 
28
26
namespace Inkscape {
29
27
    namespace XML {
30
28
        class Node;
35
33
        }
36
34
        namespace Dialog {
37
35
 
38
 
typedef std::list<EntityEntry*> RDElist;
 
36
typedef std::list<UI::Widget::EntityEntry*> RDElist;
39
37
 
40
38
class DocumentMetadata : public Inkscape::UI::Widget::Panel {
41
39
public:
56
54
    Gtk::Tooltips _tt;
57
55
    Gtk::Notebook  _notebook;
58
56
 
59
 
    NotebookPage   _page_metadata1, _page_metadata2;
 
57
    UI::Widget::NotebookPage _page_metadata1;
 
58
    UI::Widget::NotebookPage _page_metadata2;
60
59
 
61
60
    //---------------------------------------------------------------
62
61
    RDElist _rdflist;
63
 
    Licensor _licensor;
 
62
    UI::Widget::Licensor _licensor;
64
63
 
65
 
    Registry _wr;
 
64
    UI::Widget::Registry _wr;
66
65
 
67
66
private:
68
67
    virtual ~DocumentMetadata();