File valencia-gtk36.patch of Package valencia
diff --git a/browser.vala b/browser.vala
index 0500e57..32bc625 100644
--- a/browser.vala
+++ b/browser.vala
@@ -12,7 +12,7 @@ class SymbolBrowser {
Gtk.Entry find_entry;
ListViewString list;
- Gtk.VBox symbol_vbox;
+ Gtk.Box symbol_vbox;
bool visible;
@@ -29,7 +29,7 @@ class SymbolBrowser {
list.row_activated.connect(on_list_activated);
list.received_focus.connect(on_list_receive_focus);
- symbol_vbox = new Gtk.VBox(false, 6);
+ symbol_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 6);
symbol_vbox.pack_start(find_entry, false, false, 0);
symbol_vbox.pack_start(list.scrolled_window, true, true, 0);
symbol_vbox.show_all();
diff --git a/gtk_util.vala b/gtk_util.vala
index fb1e74b..e57f47e 100644
--- a/gtk_util.vala
+++ b/gtk_util.vala
@@ -126,9 +126,10 @@ class Tooltip {
window.set_transient_for(parent);
window.set_destroy_with_parent(true);
- Gdk.Color background;
- Gdk.Color.parse("#FFFF99", out background);
- window.modify_bg(Gtk.StateType.NORMAL, background);
+ Gdk.RGBA background = Gdk.RGBA();
+ if (!background.parse("#FFFF99"))
+ error("can't parse color");
+ window.override_background_color(Gtk.StateFlags.NORMAL, background);
}
public void show(string qualified_method_name, string prototype, int method_pos) {
@@ -190,15 +191,14 @@ class ProgressBarDialog : Gtk.Window {
public ProgressBarDialog(Gtk.Window parent_win, string text) {
bar = new Gtk.ProgressBar();
- Gtk.VBox vbox = new Gtk.VBox(true, 0);
- Gtk.HBox hbox = new Gtk.HBox(true, 0);
+ Gtk.Box vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+ Gtk.Box hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
- bar.set_text(text);
bar.set_size_request(226, 25);
set_size_request(250, 49);
vbox.pack_start(bar, true, false, 0);
- hbox.pack_start(vbox, true, false, 0);
+ hbox.pack_start(vbox, true, false, 0);
add(hbox);
set_title(text);
diff --git a/settings.vala b/settings.vala
index 12175de..afadaee 100644
--- a/settings.vala
+++ b/settings.vala
@@ -22,6 +22,7 @@ class ProjectSettingsDialog : Object {
Gtk.Label build_command_label = new Gtk.Label("Build command:");
build_entry = new Gtk.Entry();
build_entry.activate.connect(on_entry_activated);
+ build_entry.hexpand = true;
Gtk.Alignment align_build_label = new Gtk.Alignment(0.0f, 0.5f, 0.0f, 0.0f);
align_build_label.add(build_command_label);
@@ -29,26 +30,23 @@ class ProjectSettingsDialog : Object {
Gtk.Label clean_command_label = new Gtk.Label("Clean command:");
clean_entry = new Gtk.Entry();
clean_entry.activate.connect(on_entry_activated);
+ clean_entry.hexpand = true;
Gtk.Alignment align_clean_label = new Gtk.Alignment(0.0f, 0.5f, 0.0f, 0.0f);
align_clean_label.add(clean_command_label);
- Gtk.Table table = new Gtk.Table(2, 2, false);
- table.set_col_spacings(12);
- table.set_row_spacings(6);
+ Gtk.Grid grid = new Gtk.Grid();
+ grid.set_column_spacing(12);
+ grid.set_row_spacing(6);
- table.attach(align_build_label, 0, 1, 0, 1,
- Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0);
- table.attach(align_clean_label, 0, 1, 1, 2,
- Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0);
- table.attach(build_entry, 1, 2, 0, 1, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND,
- Gtk.AttachOptions.FILL, 0, 0);
- table.attach(clean_entry, 1, 2, 1, 2, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND,
- Gtk.AttachOptions.FILL, 0, 0);
+ grid.attach(align_build_label, 0, 0, 1, 1);
+ grid.attach(align_clean_label, 0, 1, 1, 1);
+ grid.attach(build_entry, 1, 0, 1, 1);
+ grid.attach(clean_entry, 1, 1, 1, 1);
Gtk.Alignment alignment_box = new Gtk.Alignment(0.5f, 0.5f, 1.0f, 1.0f);
alignment_box.set_padding(5, 6, 6, 5);
- alignment_box.add(table);
+ alignment_box.add(grid);
dialog = new Gtk.Dialog.with_buttons("Settings", parent_win, Gtk.DialogFlags.MODAL |
Gtk.DialogFlags.DESTROY_WITH_PARENT,
diff --git a/valencia.vala b/valencia.vala
index 71c9b3b..4356c8c 100644
--- a/valencia.vala
+++ b/valencia.vala
@@ -259,7 +259,7 @@ public class Instance : Peas.ExtensionBase, Gedit.WindowActivatable {
output_view.set_editable(false);
output_view.set_cursor_visible(false);
Pango.FontDescription font = Pango.FontDescription.from_string("Monospace");
- output_view.modify_font(font);
+ output_view.override_font(font);
output_view.button_press_event.connect(on_button_press);
output_pane = new Gtk.ScrolledWindow(null, null);