diff options
| author | raveit65 <[email protected]> | 2016-06-11 16:16:34 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2016-06-11 16:16:34 +0200 |
| commit | bf2b46a27db85b08e906404dce4e5261e523fdf3 (patch) | |
| tree | 31f6e0c7b66782e84c5f2fb2cf430d69957b797f | |
| parent | f770de3b819aa3e2c85aafc57ad62cfad5293a33 (diff) | |
| download | mate-terminal-bf2b46a27db85b08e906404dce4e5261e523fdf3.tar.bz2 mate-terminal-bf2b46a27db85b08e906404dce4e5261e523fdf3.tar.xz | |
profile-editor: render text in color scheme combobox
As we use gtk3 only code we can remove that in UI file,
finaly fix for https://github.com/mate-desktop/mate-terminal/issues/103
| -rw-r--r-- | src/profile-editor.c | 9 | ||||
| -rw-r--r-- | src/profile-preferences.ui | 6 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/profile-editor.c b/src/profile-editor.c index c22522b..48b3632 100644 --- a/src/profile-editor.c +++ b/src/profile-editor.c @@ -519,7 +519,7 @@ reset_compat_defaults_cb (GtkWidget *button, */ static void -init_color_scheme_menu (GtkWidget *combo_box) +init_color_scheme_menu (GtkWidget *widget) { GtkCellRenderer *renderer; GtkTreeIter iter; @@ -535,13 +535,12 @@ init_color_scheme_menu (GtkWidget *combo_box) 0, _("Custom"), -1); - gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store)); + gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store)); g_object_unref (store); renderer = gtk_cell_renderer_text_new (); -/*FIXME, avoid double loading of color schemes names from UI file */ -/* gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer, "text", 0, NULL);*/ + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, TRUE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (widget), renderer, "text", 0, NULL); } static char* diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui index fb8de34..4f4b542 100644 --- a/src/profile-preferences.ui +++ b/src/profile-preferences.ui @@ -1398,12 +1398,6 @@ <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> <property name="model">model4</property> - <child> - <object class="GtkCellRendererText" id="renderer4"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> </object> <packing> <property name="padding">0</property> |