- editor->priv->line_page_vbox = glade_xml_get_widget (editor->priv->gui,
- "line_page_vbox");
- editor->priv->line_width_spin = glade_xml_get_widget (editor->priv->gui,
- "line_width_spin");
- editor->priv->line_color_combo = glade_xml_get_widget (editor->priv->gui,
- "line_color_combo");
- editor->priv->line_key_combo = glade_xml_get_widget (editor->priv->gui,
- "line_key_combo");
- editor->priv->line_key_radio = glade_xml_get_widget (editor->priv->gui,
- "line_key_radio");
- editor->priv->line_color_radio = glade_xml_get_widget (editor->priv->gui,
- "line_color_radio");
-
- gl_util_combo_box_add_text_model ( GTK_COMBO_BOX(editor->priv->line_key_combo));
+ gl_builder_util_get_widgets (editor->priv->builder,
+ "line_page_vbox", &editor->priv->line_page_vbox,
+ "line_width_spin", &editor->priv->line_width_spin,
+ "line_color_hbox", &editor->priv->line_color_hbox,
+ "line_key_hbox", &editor->priv->line_key_hbox,
+ "line_key_radio", &editor->priv->line_key_radio,
+ "line_color_radio", &editor->priv->line_color_radio,
+ NULL);
+
+ editor->priv->line_color_combo = gl_color_combo_new (_("No Line"),
+ GL_COLOR_NO_LINE,
+ gl_prefs_model_get_default_line_color (gl_prefs));
+ gtk_box_pack_start (GTK_BOX (editor->priv->line_color_hbox),
+ editor->priv->line_color_combo,
+ FALSE, FALSE, 0);
+
+ editor->priv->line_key_combo = gl_field_button_new (NULL);
+ gtk_box_pack_start (GTK_BOX (editor->priv->line_key_hbox),
+ editor->priv->line_key_combo,
+ TRUE, TRUE, 0);