← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/ui/dialog/panel-dialog.h

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook, Ted Gould, Kees Cook
  • Date: 2009-06-24 14:00:43 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090624140043-07stp20mry48hqup
Tags: 0.47~pre0-0ubuntu1
* New upstream release

[ Ted Gould ]
* debian/control: Adding libgsl0 and removing version specifics on boost

[ Kees Cook ]
* debian/watch: updated to run uupdate and mangle pre-release versions.
* Dropped patches that have been taken upstream:
  - 01_mips
  - 02-poppler-0.8.3
  - 03-chinese-inkscape
  - 05_fix_latex_patch
  - 06_gcc-4.4
  - 07_cdr2svg
  - 08_skip-bad-utf-on-pdf-import
  - 09_gtk-clist
  - 10_belarussian
  - 11_libpng
  - 12_desktop
  - 13_slider
  - 100_svg_import_improvements
  - 102_sp_pattern_painter_free
  - 103_bitmap_type_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ui/dialog/panel-dialog.h
1
 
/**
2
 
 * \brief A panel holding dialog
3
 
 *
4
 
 * Authors:
 
1
/** @file
 
2
 * @brief A panel holding dialog
 
3
 */
 
4
/* Authors:
5
5
 *   Gustav Broberg <broberg@kth.se>
6
6
 *
7
7
 * Copyright (C) 2007 Authors
8
 
 *
9
8
 * Released under GNU GPL.  Read the file 'COPYING' for more information.
10
9
 */
11
10
 
20
19
 
21
20
#include "verbs.h"
22
21
#include "dialog.h"
23
 
#include "dialogs/swatches.h"
 
22
#include "ui/dialog/swatches.h"
24
23
#include "ui/dialog/floating-behavior.h"
25
24
#include "ui/dialog/dock-behavior.h"
26
 
#include "prefs-utils.h"
 
25
#include "preferences.h"
27
26
 
28
27
namespace Inkscape {
29
28
namespace UI {
147
146
    _document_replaced_connection =
148
147
        desktop->connectDocumentReplaced(sigc::mem_fun(*this, &PanelDialog::_propagateDocumentReplaced));
149
148
 
150
 
    if (prefs_get_int_attribute ("dialogs", "showclose", 0) || !apply_label.empty()) {
 
149
    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
150
    if (prefs->getBool("/dialogs/showclose") || !apply_label.empty()) {
151
151
        // TODO: make the order of buttons obey the global preference
152
152
        if (!apply_label.empty()) {
153
153
            panel.addResponseButton(apply_label, Gtk::RESPONSE_APPLY);
198
198
    _document_replaced_connection =
199
199
        desktop->connectDocumentReplaced(sigc::mem_fun(*this, &PanelDialog::_propagateDocumentReplaced));
200
200
 
201
 
    if (prefs_get_int_attribute ("dialogs", "showclose", 0) || !apply_label.empty()) {
 
201
    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
202
    if (prefs->getBool("/dialogs/showclose") || !apply_label.empty()) {
202
203
        // TODO: make the order of buttons obey the global preference
203
204
        if (!apply_label.empty()) {
204
205
            panel.addResponseButton(apply_label, Gtk::RESPONSE_APPLY);