← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gnote/vivid-proposed

« back to all changes in this revision

Viewing changes to src/sharp/propertyeditor.hpp

  • Committer: Package Import Robot
  • Author(s): Vincent Cheng
  • Date: 2011-09-24 20:18:37 UTC
  • mfrom: (1.3.11 upstream)
  • Revision ID: package-import@ubuntu.com-20110924201837-39jpl1odhsub2956
Tags: 0.8.0-1
http://bugs.debian.org/638108
http://bugs.debian.org/566670
* New upstream release, featuring GTK+ 3 port.
  - Add versioned build dependency on libglibmm-2.4-dev (>= 2.28).
  - Replace build dependency on libgtkmm-2.4-dev with libgtkmm-3.0-dev.
  - Remove build dependencies on the following packages:
    - libdbus-c++-dev
    - libgconf2-dev
    - libgtkspell-dev (GtkSpell has yet to be ported to GTK+ 3)
    - libpanelappletmm-2.6-dev (Closes: #638108)
      - This removes support for the gnome-panel applet. (Closes: #566670)
      - Support for gnome-panel will be re-enabled once
        libpanel-applet-4-dev migrates from experimental to unstable.
* Re-format debian/copyright to fix lintian warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/sharp/propertyeditor.hpp
1
1
/*
2
2
 * gnote
3
3
 *
 
4
 * Copyright (C) 2011 Aurimas Cernius
4
5
 * Copyright (C) 2009 Hubert Figuiere
5
6
 * 
6
7
 * Permission is hereby granted, free of charge, to any person obtaining a
31
32
 
32
33
#include <vector>
33
34
 
 
35
#include <giomm/settings.h>
34
36
#include <gtkmm/entry.h>
35
37
#include <gtkmm/togglebutton.h>
36
38
 
43
45
    virtual void setup() = 0;
44
46
 
45
47
  protected:
46
 
    PropertyEditorBase(const char *key, Gtk::Widget &w);
 
48
    PropertyEditorBase(Glib::RefPtr<Gio::Settings> & settings, const char *key, Gtk::Widget &w);
47
49
 
48
50
    std::string m_key;
49
51
    Gtk::Widget &m_widget;
50
52
    sigc::connection m_connection;
 
53
    Glib::RefPtr<Gio::Settings> m_settings;
51
54
  private:
52
55
    void static destroy_notify(gpointer data);
53
56
  };
56
59
      : public PropertyEditorBase
57
60
  {
58
61
  public:
59
 
    PropertyEditor(const char * key, Gtk::Entry &entry);
 
62
    PropertyEditor(Glib::RefPtr<Gio::Settings> & settings, const char * key, Gtk::Entry &entry);
60
63
 
61
64
    virtual void setup();
62
65
 
68
71
    : public PropertyEditorBase
69
72
  {
70
73
  public:
71
 
    PropertyEditorBool(const char * key, Gtk::ToggleButton &button);
 
74
    PropertyEditorBool(Glib::RefPtr<Gio::Settings> & settings, const char * key, Gtk::ToggleButton &button);
72
75
    void add_guard(Gtk::Widget* w)
73
76
      {
74
77
        m_guarded.push_back(w);