[gitg] Remove use of deprecated margin/padding
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Remove use of deprecated margin/padding
- Date: Thu, 10 Jul 2014 11:56:33 +0000 (UTC)
commit af0f6ac19fe2885a23e40a9c07c0690c2fe418ba
Author: Jesse van den Kieboom <jessevdk gnome org>
Date: Thu Jul 10 13:56:13 2014 +0200
Remove use of deprecated margin/padding
gitg/commit/gitg-commit-dialog.vala | 8 +-
gitg/resources/ui/gitg-author-details-dialog.ui | 2 +-
gitg/resources/ui/gitg-clone-dialog.ui | 6 +-
gitg/resources/ui/gitg-commit-dialog.ui | 4 +-
gitg/resources/ui/gitg-history-paned.ui | 2 +-
gitg/resources/ui/gitg-preferences-commit.ui | 236 +++++++++----------
gitg/resources/ui/gitg-preferences-history.ui | 266 ++++++++++-----------
gitg/resources/ui/gitg-preferences-interface.ui | 48 ++---
libgitg/resources/diff-view-options.ui | 6 +-
libgitg/resources/gitg-repository-list-box-row.ui | 37 +--
10 files changed, 283 insertions(+), 332 deletions(-)
---
diff --git a/gitg/commit/gitg-commit-dialog.vala b/gitg/commit/gitg-commit-dialog.vala
index 0ba66e7..5d3a914 100644
--- a/gitg/commit/gitg-commit-dialog.vala
+++ b/gitg/commit/gitg-commit-dialog.vala
@@ -304,11 +304,11 @@ class Dialog : Gtk.Dialog
if (rtl == (Pango.find_base_dir(s, -1) != Pango.Direction.RTL))
{
- d_label_user.xalign = 1.0f;
+ d_label_user.halign = Gtk.Align.END;
}
else
{
- d_label_user.xalign = 0.0f;
+ d_label_user.halign = Gtk.Align.START;
}
var t = d_author.get_time();
@@ -328,11 +328,11 @@ class Dialog : Gtk.Dialog
if (rtl == (Pango.find_base_dir(date_string, -1) != Pango.Direction.RTL))
{
- d_label_date.xalign = 1.0f;
+ d_label_date.halign = Gtk.Align.END;
}
else
{
- d_label_date.xalign = 0.0f;
+ d_label_date.halign = Gtk.Align.START;
}
var ac = Gitg.AvatarCache.default();
diff --git a/gitg/resources/ui/gitg-author-details-dialog.ui b/gitg/resources/ui/gitg-author-details-dialog.ui
index 157bb25..6ceb356 100644
--- a/gitg/resources/ui/gitg-author-details-dialog.ui
+++ b/gitg/resources/ui/gitg-author-details-dialog.ui
@@ -65,7 +65,7 @@
<property name="height_request">0</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_right">5</property>
+ <property name="margin_end">5</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
diff --git a/gitg/resources/ui/gitg-clone-dialog.ui b/gitg/resources/ui/gitg-clone-dialog.ui
index 972b7f3..2d62ad6 100644
--- a/gitg/resources/ui/gitg-clone-dialog.ui
+++ b/gitg/resources/ui/gitg-clone-dialog.ui
@@ -65,7 +65,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Remote _URL:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry_url</property>
@@ -96,7 +96,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">_Local Folder:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">button_location</property>
@@ -129,7 +129,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
diff --git a/gitg/resources/ui/gitg-commit-dialog.ui b/gitg/resources/ui/gitg-commit-dialog.ui
index 421c502..c6372e3 100644
--- a/gitg/resources/ui/gitg-commit-dialog.ui
+++ b/gitg/resources/ui/gitg-commit-dialog.ui
@@ -111,7 +111,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -128,7 +128,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
diff --git a/gitg/resources/ui/gitg-history-paned.ui b/gitg/resources/ui/gitg-history-paned.ui
index 43e316b..2b13b1c 100644
--- a/gitg/resources/ui/gitg-history-paned.ui
+++ b/gitg/resources/ui/gitg-history-paned.ui
@@ -49,7 +49,7 @@
<object class="GtkStackSwitcher" id="d_stack_switcher_panels">
<property name="visible">True</property>
<property name="halign">center</property>
- <property name="margin-bottom">6</property>
+ <property name="margin_bottom">6</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/gitg/resources/ui/gitg-preferences-commit.ui b/gitg/resources/ui/gitg-preferences-commit.ui
index 418b385..70b4070 100644
--- a/gitg/resources/ui/gitg-preferences-commit.ui
+++ b/gitg/resources/ui/gitg-preferences-commit.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires gtk+ 3.12 -->
<object class="GtkAdjustment" id="spin_button_right_margin_adjustment">
<property name="lower">1</property>
<property name="upper">160</property>
@@ -32,28 +32,52 @@
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="margin_start">12</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkCheckButton" id="check_button_show_markup">
+ <property name="label" translatable="yes">Show markup</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">False</property>
+ <property name="is_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid_show_markup">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="margin_start">12</property>
<child>
- <object class="GtkCheckButton" id="check_button_show_markup">
- <property name="label" translatable="yes">Show markup</property>
+ <object class="GtkCheckButton" id="check_button_show_subject_margin">
+ <property name="label" translatable="yes">Display _subject margin at column:</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
<property name="receives_default">False</property>
- <property name="xalign">0</property>
+ <property name="use_underline">True</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -64,155 +88,115 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkGrid" id="spin_button_subject_margin_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid_show_markup">
+ <object class="GtkSpinButton" id="spin_button_subject_margin">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="check_button_show_subject_margin">
- <property name="label" translatable="yes">Display _subject margin at
column:</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="spin_button_subject_margin_grid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <child>
- <object class="GtkSpinButton" id="spin_button_subject_margin">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <property name="adjustment">spin_button_subject_margin_adjustment</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="check_button_show_right_margin">
- <property name="label" translatable="yes">Display right _margin at
column:</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="spin_button_right_margin_grid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <child>
- <object class="GtkSpinButton" id="spin_button_right_margin">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <property name="adjustment">spin_button_right_margin_adjustment</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
+ <property name="adjustment">spin_button_subject_margin_adjustment</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="enable_spell_checking">
- <property name="label" translatable="yes">Enable spell checking</property>
+ <object class="GtkCheckButton" id="check_button_show_right_margin">
+ <property name="label" translatable="yes">Display right _margin at column:</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
<property name="receives_default">False</property>
- <property name="xalign">0</property>
+ <property name="use_underline">True</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="spin_button_right_margin_grid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_focus">False</property>
+ <property name="is_focus">False</property>
+ <child>
+ <object class="GtkSpinButton" id="spin_button_right_margin">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">False</property>
+ <property name="is_focus">False</property>
+ <property name="adjustment">spin_button_right_margin_adjustment</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="enable_spell_checking">
+ <property name="label" translatable="yes">Enable spell checking</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">False</property>
+ <property name="is_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
<packing>
@@ -228,7 +212,7 @@
<property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Commit Message</property>
<attributes>
<attribute name="weight" value="bold"/>
diff --git a/gitg/resources/ui/gitg-preferences-history.ui b/gitg/resources/ui/gitg-preferences-history.ui
index 5832471..5a24edc 100644
--- a/gitg/resources/ui/gitg-preferences-history.ui
+++ b/gitg/resources/ui/gitg-preferences-history.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires gtk+ 3.12 -->
<object class="GtkAdjustment" id="adjustment_collapse">
<property name="upper">5</property>
<property name="value">2</property>
@@ -32,7 +32,7 @@
<property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Commits</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -46,191 +46,175 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="margin_start">12</property>
<child>
- <object class="GtkGrid" id="grid4">
+ <object class="GtkCheckButton" id="collapse_inactive_lanes_enabled">
+ <property name="label" translatable="yes">Collapse inactive lanes</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">False</property>
+ <property name="is_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="show_stash">
+ <property name="label" translatable="yes">Show stash in history</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">False</property>
+ <property name="is_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="show_staged">
+ <property name="label" translatable="yes">Show staged changes in history</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">False</property>
+ <property name="is_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="show_unstaged">
+ <property name="label" translatable="yes">Show unstaged changes in history</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">False</property>
+ <property name="is_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="topological_order">
+ <property name="label" translatable="yes">Show history in topological order</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">False</property>
+ <property name="is_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">6</property>
+ <property name="margin_start">12</property>
<child>
- <object class="GtkCheckButton" id="collapse_inactive_lanes_enabled">
- <property name="label" translatable="yes">Collapse inactive lanes</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkScale" id="collapse_inactive_lanes">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="hexpand">True</property>
+ <property name="adjustment">adjustment_collapse</property>
+ <property name="digits">0</property>
+ <property name="draw_value">False</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="show_stash">
- <property name="label" translatable="yes">Show stash in history</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="show_staged">
- <property name="label" translatable="yes">Show staged changes in history</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="show_unstaged">
- <property name="label" translatable="yes">Show unstaged changes in history</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="topological_order">
- <property name="label" translatable="yes">Show history in topological order</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Early</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="left_padding">18</property>
- <child>
- <object class="GtkGrid" id="grid5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <property name="hexpand">True</property>
- <child>
- <object class="GtkScale" id="collapse_inactive_lanes">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <property name="hexpand">True</property>
- <property name="adjustment">adjustment_collapse</property>
- <property name="digits">0</property>
- <property name="draw_value">False</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Early</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Late</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Late</property>
</object>
<packing>
- <property name="left_attach">0</property>
+ <property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
<packing>
diff --git a/gitg/resources/ui/gitg-preferences-interface.ui b/gitg/resources/ui/gitg-preferences-interface.ui
index 85cd4c5..f29b3f2 100644
--- a/gitg/resources/ui/gitg-preferences-interface.ui
+++ b/gitg/resources/ui/gitg-preferences-interface.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires gtk+ 3.12 -->
<template class="GitgPreferencesInterface" parent="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -25,7 +25,7 @@
<property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Layout</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -39,41 +39,33 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="margin_start">12</property>
<child>
- <object class="GtkGrid" id="grid2">
+ <object class="GtkCheckButton" id="horizontal_layout_enabled">
+ <property name="label" translatable="yes">Use horizontal layout</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="horizontal_layout_enabled">
- <property name="label" translatable="yes">Use horizontal layout</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
<packing>
diff --git a/libgitg/resources/diff-view-options.ui b/libgitg/resources/diff-view-options.ui
index c76d403..b63d9ac 100644
--- a/libgitg/resources/diff-view-options.ui
+++ b/libgitg/resources/diff-view-options.ui
@@ -30,7 +30,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Ignore whitespace changes</property>
</object>
<packing>
@@ -55,7 +55,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Show changes inline</property>
</object>
<packing>
@@ -84,7 +84,7 @@
<object class="GtkLabel" id="label_context">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Context</property>
</object>
<packing>
diff --git a/libgitg/resources/gitg-repository-list-box-row.ui
b/libgitg/resources/gitg-repository-list-box-row.ui
index 0cfc7aa..751156b 100644
--- a/libgitg/resources/gitg-repository-list-box-row.ui
+++ b/libgitg/resources/gitg-repository-list-box-row.ui
@@ -11,39 +11,30 @@
<property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_right">12</property>
+ <property name="margin_start">12</property>
+ <property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="column_spacing">10</property>
<child>
- <object class="GtkAlignment" id="delete_button_align">
+ <object class="GtkButton" id="d_remove_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
- <property name="yscale">0</property>
- <property name="yalign">0.5</property>
+ <property name="vexpand">False</property>
+ <property name="valign">center</property>
+ <property name="relief">none</property>
+ <property name="tooltip_text" translatable="yes">Remove the repository from the list (does
not delete the repository from disk)</property>
+ <signal name="clicked" handler="remove_button_clicked" swapped="no"/>
+ <style>
+ <class name="image-button"/>
+ </style>
<child>
- <object class="GtkButton" id="d_remove_button">
+ <object class="GtkImage" id="delete_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_focus">False</property>
- <property name="is_focus">False</property>
- <property name="vexpand">False</property>
- <property name="relief">none</property>
- <property name="tooltip_text" translatable="yes">Remove the repository from the list
(does not delete the repository from disk)</property>
- <signal name="clicked" handler="remove_button_clicked" swapped="no"/>
- <style>
- <class name="image-button"/>
- </style>
- <child>
- <object class="GtkImage" id="delete_image">
- <property name="visible">True</property>
- <property name="pixel_size">16</property>
- <property name="icon_name">list-remove-symbolic</property>
- </object>
- </child>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">list-remove-symbolic</property>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
