fix compile

[inkscape.git] / src / ui / dialog / svg-fonts-dialog.cpp

diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 7df7e3b892af0972dfc61f602ff0fa590562a0bc..22d03998676056d2955a74deacec105c36f3f9c3 100644 (file)
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -16,12 +16,12 @@
 #ifdef ENABLE_SVG_FONTS
 
 #include "svg-fonts-dialog.h"
+#include <glibmm/i18n.h>
 #include <string.h>
 
 SvgFontDrawingArea::SvgFontDrawingArea(){
        this->text = "";
        this->svgfont = NULL;
-        ((Gtk::Widget*) this)->set_size_request(150, 50);
 }
 
 void SvgFontDrawingArea::set_svgfont(SvgFont* svgfont){
@@ -32,6 +32,12 @@ void SvgFontDrawingArea::set_text(Glib::ustring text){
        this->text = text;
 }
 
+void SvgFontDrawingArea::set_size(int x, int y){
+    this->x = x;
+    this->y = y;
+    ((Gtk::Widget*) this)->set_size_request(x, y);
+}
+
 void SvgFontDrawingArea::redraw(){
        ((Gtk::Widget*) this)->queue_draw();
 }
@@ -41,8 +47,8 @@ bool SvgFontDrawingArea::on_expose_event (GdkEventExpose *event){
     Glib::RefPtr<Gdk::Window> window = get_window();
     Cairo::RefPtr<Cairo::Context> cr = window->create_cairo_context();
     cr->set_font_face( Cairo::RefPtr<Cairo::FontFace>(new Cairo::FontFace(this->svgfont->get_font_face(), false /* does not have reference */)) );
-    cr->set_font_size (20);
-    cr->move_to (20, 20);
+    cr->set_font_size (this->y-20);
+    cr->move_to (10, 10);
     cr->show_text (this->text.c_str());
   }
   return TRUE;
@@ -69,10 +75,11 @@ void GlyphComboBox::update(SPFont* spfont){
 }
 
 void SvgFontsDialog::on_kerning_changed(){
-    //set kerning value = spin.value()
-    this->kerning_pair->k = kerning_spin.get_value();
-    kerning_preview.redraw();
-    _font_da.redraw();
+    if (this->kerning_pair){
+        this->kerning_pair->k = kerning_spin.get_value();
+        kerning_preview.redraw();
+        _font_da.redraw();
+    }
 }
 
 void SvgFontsDialog::on_glyphs_changed(){
@@ -95,6 +102,8 @@ void SvgFontsDialog::on_glyphs_changed(){
 //TODO:
     //if not found,
       //create new kern node
+    if (this->kerning_pair)
+        kerning_spin.set_value(this->kerning_pair->k);
 }
 
 /* Add all fonts in the document to the combobox. */
@@ -123,11 +132,29 @@ void SvgFontsDialog::on_preview_text_changed(){
 }
 
 void SvgFontsDialog::on_font_selection_changed(){
-    first_glyph.update(this->get_selected_spfont());
-    second_glyph.update(this->get_selected_spfont());
-    kerning_preview.set_svgfont(this->get_selected_svgfont());
-    _font_da.set_svgfont(this->get_selected_svgfont());
+    SPFont* spfont = this->get_selected_spfont();
+    SvgFont* svgfont = this->get_selected_svgfont();
+    first_glyph.update(spfont);
+    second_glyph.update(spfont);
+    kerning_preview.set_svgfont(svgfont);
+    _font_da.set_svgfont(svgfont);
     _font_da.redraw();
+
+    int steps = 50;
+    double set_width = spfont->horiz_adv_x;
+    setwidth_spin.set_value(set_width);
+
+    kerning_spin.set_range(0,set_width);
+    kerning_spin.set_increments(int(set_width/steps),2*int(set_width/steps));
+    kerning_spin.set_value(0);
+}
+
+void SvgFontsDialog::on_setwidth_changed(){
+    SPFont* spfont = this->get_selected_spfont();
+    if (spfont){
+        spfont->horiz_adv_x = setwidth_spin.get_value();
+        //TODO: tell cairo that the glyphs cache has to be invalidated
+    }
 }
 
 SvgFont* SvgFontsDialog::get_selected_svgfont()
@@ -157,7 +184,7 @@ SvgFontsDialog::SvgFontsDialog()
 //List of SVGFonts declared in a document:
     _model = Gtk::ListStore::create(_columns);
     _font_list.set_model(_model);
-    _font_list.append_column_editable("_Font", _columns.label);
+    _font_list.append_column_editable(_("_Font"), _columns.label);
     _font_list.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_font_selection_changed));
 
     this->update_fonts();
@@ -165,27 +192,50 @@ SvgFontsDialog::SvgFontsDialog()
 //kerning setup:
     Gtk::VBox* kernvbox = Gtk::manage(new Gtk::VBox());
     _font_settings.add(*kernvbox);
-    kernvbox->add(*Gtk::manage(new Gtk::Label("Kerning Setup:")));
+
+//Set Width (horiz_adv_x):
+    Gtk::HBox* setwidth_hbox = Gtk::manage(new Gtk::HBox());
+    setwidth_hbox->add(*Gtk::manage(new Gtk::Label(_("Set width (not working yet):"))));
+    setwidth_hbox->add(setwidth_spin);
+
+    setwidth_spin.signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_setwidth_changed));
+    setwidth_spin.set_range(0, 4096);
+    setwidth_spin.set_increments(10, 100);
+    _font_settings.add(*setwidth_hbox);
+
+//Kerning Setup:
+    kernvbox->add(*Gtk::manage(new Gtk::Label(_("Kerning Setup:"))));
     Gtk::HBox* kerning_selector = Gtk::manage(new Gtk::HBox());
+    kerning_selector->add(*Gtk::manage(new Gtk::Label(_("1st Glyph:"))));
     kerning_selector->add(first_glyph);
+    kerning_selector->add(*Gtk::manage(new Gtk::Label(_("2nd Glyph:"))));
     kerning_selector->add(second_glyph);
-    kerning_spin.set_range(0,1000);
-    kerning_spin.set_increments(10,20);
     first_glyph.signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_glyphs_changed));
     second_glyph.signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_glyphs_changed));
     kerning_spin.signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_kerning_changed));
 
     kernvbox->add(*kerning_selector);
     kernvbox->add((Gtk::Widget&) kerning_preview);
-    kernvbox->add(kerning_spin);
+
+    Gtk::HBox* kerning_amount_hbox = Gtk::manage(new Gtk::HBox());
+    kernvbox->add(*kerning_amount_hbox);
+    kerning_amount_hbox->add(*Gtk::manage(new Gtk::Label(_("Kerning value:"))));
+    kerning_amount_hbox->add(kerning_spin);
+
+    kerning_preview.set_size(300 + 20, 150 + 20);
+    _font_da.set_size(150 + 20, 50 + 20);
 
 //Text Preview:
     _preview_entry.signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_preview_text_changed));
-    _getContents()->add(*Gtk::manage(new Gtk::Label("Preview Text:")));
     _getContents()->add((Gtk::Widget&) _font_da);
     _preview_entry.set_text("Sample Text");
     _font_da.set_text("Sample Text");
-    _getContents()->add(_preview_entry);
+
+    Gtk::HBox* preview_entry_hbox = Gtk::manage(new Gtk::HBox());
+    _getContents()->add(*preview_entry_hbox);
+    preview_entry_hbox->add(*Gtk::manage(new Gtk::Label(_("Preview Text:"))));
+    preview_entry_hbox->add(_preview_entry);
+
     _getContents()->show_all();
 }