diff options
| author | Adrian Boguszewski <adrbogus1@student.pg.gda.pl> | 2016-07-03 18:54:07 +0000 |
|---|---|---|
| committer | Adrian Boguszewski <adrbogus1@student.pg.gda.pl> | 2016-07-03 18:54:07 +0000 |
| commit | 6d69327a30a7c180b86e82fffc2a6bee92ad3006 (patch) | |
| tree | 735ff28c5e1f5645c0be9c30dcffbc1f278a382f /src/ui/dialog/svg-fonts-dialog.cpp | |
| parent | Added items as a range function (diff) | |
| parent | Rename function, fix some indenting issues. (diff) | |
| download | inkscape-6d69327a30a7c180b86e82fffc2a6bee92ad3006.tar.gz inkscape-6d69327a30a7c180b86e82fffc2a6bee92ad3006.zip | |
Merged trunk
(bzr r14954.1.14)
Diffstat (limited to 'src/ui/dialog/svg-fonts-dialog.cpp')
| -rw-r--r-- | src/ui/dialog/svg-fonts-dialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp index 100a620fa..1ca10e282 100644 --- a/src/ui/dialog/svg-fonts-dialog.cpp +++ b/src/ui/dialog/svg-fonts-dialog.cpp @@ -266,7 +266,7 @@ void SvgFontsDialog::update_fonts() { SPDesktop* desktop = this->getDesktop(); SPDocument* document = desktop->getDocument(); - std::vector<SPObject *> fonts = document->getResourceList( "fonts" ); + std::vector<SPObject *> fonts = document->getResourceList( "font" ); _model->clear(); for (std::vector<SPObject *>::const_iterator it = fonts.begin(); it != fonts.end(); ++it) { @@ -340,7 +340,7 @@ void SvgFontsDialog::on_font_selection_changed(){ update_sensitiveness(); } -void SvgFontsDialog::on_setwidth_changed(){ +void SvgFontsDialog::on_setfontdata_changed(){ SPFont* spfont = this->get_selected_spfont(); if (spfont){ spfont->horiz_adv_x = setwidth_spin.get_value(); @@ -397,7 +397,7 @@ Gtk::VBox* SvgFontsDialog::global_settings_tab(){ setwidth_hbox->add(*Gtk::manage(new Gtk::Label(_("Set width:")))); setwidth_hbox->add(setwidth_spin); - setwidth_spin.signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_setwidth_changed)); + setwidth_spin.signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_setfontdata_changed)); setwidth_spin.set_range(0, 4096); setwidth_spin.set_increments(10, 0); global_vbox.pack_start(*setwidth_hbox, false, false); |