more mockup on svgfonts dialog

diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 9483b291566153b1d4d9ec542a555ce84fb2d172..ccbe450463b3d50d48a112b02b01a54f230a8379 100644 (file)
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -67,6 +67,23 @@ Gtk::HBox* SvgFontsDialog::AttrEntry(gchar* lbl){
     return hbox;
 }
 
+Gtk::HBox* SvgFontsDialog::AttrCombo(gchar* lbl){
+    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(){
@@ -185,6 +202,11 @@ SPFont* SvgFontsDialog::get_selected_spfont()
 Gtk::VBox* SvgFontsDialog::global_settings_tab(){
     Gtk::VBox* global_vbox = Gtk::manage(new Gtk::VBox());
 
+    global_vbox->add(*AttrEntry((gchar*) "Family Name"));
+    global_vbox->add(*AttrCombo((gchar*) "Style"));
+    global_vbox->add(*AttrCombo((gchar*) "Variant"));
+    global_vbox->add(*AttrCombo((gchar*) "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:"))));
@@ -200,8 +222,10 @@ Gtk::VBox* SvgFontsDialog::global_settings_tab(){
 
 Gtk::VBox* SvgFontsDialog::glyphs_tab(){
     Gtk::VBox* glyphs_vbox = Gtk::manage(new Gtk::VBox());
-    glyphs_vbox->add(*AttrEntry((gchar*) "Name"));
+    glyphs_vbox->add(*AttrEntry((gchar*) "Glyph Name"));
     glyphs_vbox->add(*AttrEntry((gchar*) "Unicode"));
+    //glyphs_vbox->add(*AttrSpin((gchar*) "Horizontal Advance"));
+    //glyphs_vbox->add(*AttrCombo((gchar*) "Missing Glyph"));
     return glyphs_vbox;
 }
 

diff --git a/src/ui/dialog/svg-fonts-dialog.h b/src/ui/dialog/svg-fonts-dialog.h
index 9ce26f80dd0a9bc99d4b6455f05599576a58f575..d478f8d8d738b51e0becd57789ee20d59eb02161 100644 (file)
--- a/src/ui/dialog/svg-fonts-dialog.h
+++ b/src/ui/dialog/svg-fonts-dialog.h
@@ -72,6 +72,8 @@ public:
 
 private:
     Gtk::HBox* AttrEntry(gchar* lbl);
+    Gtk::HBox* AttrCombo(gchar* lbl);
+//    Gtk::HBox* AttrSpin(gchar* lbl);
     Gtk::VBox* global_settings_tab();
     Gtk::VBox* kerning_tab();
     Gtk::VBox* glyphs_tab();