← Back to branch summary

~ubuntu-branches/ubuntu/precise/glom/precise-updates

« back to all changes in this revision

Viewing changes to glom/utility_widgets/labelglom.cc

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-10-09 16:50:36 UTC
  • mfrom: (1.1.42 upstream)
  • Revision ID: james.westby@ubuntu.com-20091009165036-orinvwmohk838xxl
Tags: 1.12.2-0ubuntu1
https://launchpad.net/bugs/391664
https://launchpad.net/bugs/428445
https://launchpad.net/bugs/230007
https://launchpad.net/bugs/393229
https://launchpad.net/bugs/393231
https://launchpad.net/bugs/394507
https://launchpad.net/bugs/394887
https://launchpad.net/bugs/394894
https://launchpad.net/bugs/397409
https://launchpad.net/bugs/381563
* New upstream version:
  - FFE LP: #391664
* debian/control:
  - Bump python-gnome2-extras-dev build-dep to >= 2.25.3.
  - Bump libgdamm3.0-dev build-dep to libgdamm4.0-dev >= 3.99.14.
  - Change libgda3-dev build-dep to libgda-4.0-dev.
  - Change libgda3-postgres dependency to libgda-4.0-postgres.
  - Bump libgtkmm-2.4-dev build-dep to >= 2.14.
  - Add build-dep on libgconfmm-2.6-dev.
  - Bump libgoocanvasmm-dev build-dep to >= 0.14.0.
  - Remove build-dep on libbakery-2.6-dev.
  - Bump postgresql-8.3 dependency to postgresql-8.4.
  - Change scrollkeeper build-dep to rarian-compat.
  - Rename libglom{0,-dev} -> libglom-1.12-{0,dev}. Upstream include
    APIVER in the library name now.
* debian/rules:
  - Update --with-postgres-utils configure flag to point to the new
    path.
  - Drop deprecated --disable-scrollkeeper configure flag.
  - Update DEB_SHLIBDEPS_INCLUDE with new libglom-1.12-0 package name.
  - Don't include /usr/share/cdbs/1/rules/simple-patchsys.mk - there
    are currently no patches.
* debian/libglom-1.12-0.install:
  - Updated for new version.
* debian/libglom-1.12-dev.install:
  - Install pc and header files.
* debian/glom-doc.install:
  - Updated for new version.
* debian/glom.install:
  - Updated for new version.
* Fix debian/watch.
* Dropped obsolete 10-distro-install-postgres-change.patch.
* Built against latest libgoocanvasmm (LP: #428445).
* Also closes LP: #230007, LP: #393229, LP: #393231, LP: #394507,
  LP: #394887, LP: #394894, LP: #397409, LP: #381563.

Show diffs side-by-side

added added

removed removed

Lines of Context:
glom/utility_widgets/labelglom.cc
20
20
 
21
21
#include "labelglom.h"
22
22
#include <gtkmm/messagedialog.h>
23
 
#include "../application.h"
 
23
#include <glom/application.h>
24
24
#include <glibmm/i18n.h>
25
 
#include "../layout_item_dialogs/dialog_textobject.h"
26
 
#include "../libglom/glade_utils.h"
 
25
#include <glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h>
 
26
#include <glom/glade_utils.h>
27
27
#include "../mode_data/flowtablewithfields.h"
28
28
//#include <sstream> //For stringstream
29
29
 
65
65
void LabelGlom::on_menu_properties_activate()
66
66
{
67
67
  sharedptr<LayoutItem_Text> textobject = sharedptr<LayoutItem_Text>::cast_dynamic(m_pLayoutItem);
68
 
  if (!textobject)
 
68
  if(!textobject)
69
69
    return;
 
70
 
70
71
  try
71
72
  {
72
 
    Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_textobject");
 
73
    Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_textobject");
73
74
 
74
75
    Dialog_TextObject* dialog = 0;
75
76
    refXml->get_widget_derived("window_textobject", dialog);
89
90
      delete dialog;
90
91
    }
91
92
  }
92
 
  catch(const Gnome::Glade::XmlError& ex)
 
93
  catch(const Gtk::BuilderError& ex)
93
94
  {
94
95
    std::cerr << ex.what() << std::endl;
95
96
  }