Code

Add a zoom correction option to preferences (used when zooming to 1:1 etc. to display...
[inkscape.git] / src / ui / dialog / svg-fonts-dialog.cpp
index b5489e31ac33c7fca623335b41c1d83e87558599..fa81e84ca7e754aa68028be49c0efc037229ae61 100644 (file)
 
 #ifdef ENABLE_SVG_FONTS
 
+#include <gtkmm/notebook.h>
 #include "svg-fonts-dialog.h"
+#include <glibmm/i18n.h>
 #include <string.h>
+#include "xml/node.h"
 
 SvgFontDrawingArea::SvgFontDrawingArea(){
        this->text = "";
@@ -46,7 +49,7 @@ 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 (this->y);
+    cr->set_font_size (this->y-20);
     cr->move_to (10, 10);
     cr->show_text (this->text.c_str());
   }
@@ -57,6 +60,76 @@ namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
+/*
+Gtk::HBox* SvgFontsDialog::AttrEntry(gchar* lbl, const SPAttributeEnum attr){
+    Gtk::HBox* hbox = Gtk::manage(new Gtk::HBox());
+    hbox->add(* Gtk::manage(new Gtk::Label(lbl)) );
+    Gtk::Entry* entry = Gtk::manage(new Gtk::Entry());
+    hbox->add(* entry );
+    hbox->show_all();
+
+    entry->signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_attr_changed));
+    return hbox;
+}
+*/
+
+SvgFontsDialog::AttrEntry::AttrEntry(SvgFontsDialog* d, gchar* lbl, const SPAttributeEnum attr){
+    this->dialog = d;
+    this->attr = attr;
+    this->add(* Gtk::manage(new Gtk::Label(lbl)) );
+    this->add(entry);
+    this->show_all();
+
+    entry.signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::AttrEntry::on_attr_changed));
+}
+
+void SvgFontsDialog::AttrEntry::on_attr_changed(){
+       g_warning("attr entry changed: %s", this->entry.get_text().c_str());
+
+       SPObject* o = NULL;
+        for(SPObject* node = this->dialog->get_selected_spfont()->children; node; node=node->next){
+            switch(this->attr){
+               case SP_PROP_FONT_FAMILY:
+                       if (SP_IS_FONTFACE(node)){
+                               o = node;
+                               continue;
+                       }
+                       break;
+               default:
+                       o = NULL;
+           }
+        }
+
+       const gchar* name = (const gchar*)sp_attribute_name(this->attr);
+        if(name && o) {
+            SP_OBJECT_REPR(o)->setAttribute((const gchar*) name, this->entry.get_text().c_str());
+            o->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+
+            Glib::ustring undokey = "svgfonts:";
+            undokey += name;
+            sp_document_maybe_done(o->document, undokey.c_str(), SP_VERB_DIALOG_SVG_FONTS,
+                                   _("Set SVG Font attribute"));
+        }
+
+}
+
+Gtk::HBox* SvgFontsDialog::AttrCombo(gchar* lbl, const SPAttributeEnum attr){
+    Gtk::HBox* hbox = Gtk::manage(new Gtk::HBox());
+    hbox->add(* Gtk::manage(new Gtk::Label(lbl)) );
+    hbox->add(* Gtk::manage(new Gtk::ComboBox()) );
+    hbox->show_all();
+    return hbox;
+}
+
+/*
+Gtk::HBox* SvgFontsDialog::AttrSpin(gchar* lbl){
+    Gtk::HBox* hbox = Gtk::manage(new Gtk::HBox());
+    hbox->add(* Gtk::manage(new Gtk::Label(lbl)) );
+    hbox->add(* Gtk::manage(new Gtk::SpinBox()) );
+    hbox->show_all();
+    return hbox;
+}*/
+
 /*** SvgFontsDialog ***/
 
 GlyphComboBox::GlyphComboBox(){
@@ -141,11 +214,21 @@ void SvgFontsDialog::on_font_selection_changed(){
 
     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()
 {
     Gtk::TreeModel::iterator i = _font_list.get_selection()->get_selected();
@@ -162,6 +245,69 @@ SPFont* SvgFontsDialog::get_selected_spfont()
     return NULL;
 }
 
+Gtk::VBox* SvgFontsDialog::global_settings_tab(){
+    Gtk::VBox* global_vbox = Gtk::manage(new Gtk::VBox());
+
+    AttrEntry* familyname;
+    familyname = new AttrEntry(this, (gchar*) "Family Name", SP_PROP_FONT_FAMILY);
+
+    global_vbox->add(*familyname);
+    global_vbox->add(*AttrCombo((gchar*) "Style", SP_PROP_FONT_STYLE));
+    global_vbox->add(*AttrCombo((gchar*) "Variant", SP_PROP_FONT_VARIANT));
+    global_vbox->add(*AttrCombo((gchar*) "Weight", SP_PROP_FONT_WEIGHT));
+
+//Set Width (horiz_adv_x):
+    Gtk::HBox* setwidth_hbox = Gtk::manage(new Gtk::HBox());
+    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.set_range(0, 4096);
+    setwidth_spin.set_increments(10, 100);
+    global_vbox->add(*setwidth_hbox);
+
+    return global_vbox;
+}
+
+Gtk::VBox* SvgFontsDialog::glyphs_tab(){
+    Gtk::VBox* glyphs_vbox = Gtk::manage(new Gtk::VBox());
+    glyphs_vbox->add(*new SvgFontsDialog::AttrEntry(this, (gchar*) "Glyph Name", SP_ATTR_GLYPH_NAME));
+    glyphs_vbox->add(*new SvgFontsDialog::AttrEntry(this, (gchar*) "Unicode", SP_ATTR_UNICODE));
+    //glyphs_vbox->add(*AttrSpin((gchar*) "Horizontal Advance"), SP_ATTR_HORIZ_ADV_X);
+    //glyphs_vbox->add(*AttrCombo((gchar*) "Missing Glyph"), SP_ATTR_); ?
+    return glyphs_vbox;
+}
+
+Gtk::VBox* SvgFontsDialog::kerning_tab(){
+
+//kerning setup:
+    Gtk::VBox* kernvbox = Gtk::manage(new Gtk::VBox());
+
+//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);
+    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);
+
+    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);
+
+    return kernvbox;
+}
+
 SvgFontsDialog::SvgFontsDialog()
  : UI::Widget::Panel("", "dialogs.svgfonts", SP_VERB_DIALOG_SVG_FONTS)
 {
@@ -173,36 +319,31 @@ 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();
 
-//kerning setup:
-    Gtk::VBox* kernvbox = Gtk::manage(new Gtk::VBox());
-    _font_settings.add(*kernvbox);
-    kernvbox->add(*Gtk::manage(new Gtk::Label("Kerning Setup:")));
-    Gtk::HBox* kerning_selector = Gtk::manage(new Gtk::HBox());
-    kerning_selector->add(first_glyph);
-    kerning_selector->add(second_glyph);
-    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));
+    Gtk::Notebook *tabs = Gtk::manage(new Gtk::Notebook());
+    tabs->set_scrollable();
 
-    kernvbox->add(*kerning_selector);
-    kernvbox->add((Gtk::Widget&) kerning_preview);
-    kernvbox->add(kerning_spin);
+    tabs->append_page(*global_settings_tab(), _("_Global Settings"), true);
+    tabs->append_page(*glyphs_tab(), _("_Glyphs"), true);
+    tabs->append_page(*kerning_tab(), _("_Kerning"), true);
 
-    kerning_preview.set_size(300, 150);
-    _font_da.set_size(150, 50);
+    _font_settings.add(*tabs);
 
 //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();
 }