From 8fe6428d3cb0d38513530d1041d4977a1b619242 Mon Sep 17 00:00:00 2001
From: Elvis de Souza <elvis.desouza99@gmail.com>
Date: Wed, 23 Jun 2021 19:52:42 -0300
Subject: [PATCH] one less box line

---
 conllu-merge-resolver.css   | 2 +-
 conllu-merge-resolver.glade | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/conllu-merge-resolver.css b/conllu-merge-resolver.css
index 5ead761..e33418a 100644
--- a/conllu-merge-resolver.css
+++ b/conllu-merge-resolver.css
@@ -29,6 +29,6 @@
 }
 
 .colbutton {
-   padding: 2px 2px;
+   padding: 0px 4px;
    margin: 1px 1px;
 }
diff --git a/conllu-merge-resolver.glade b/conllu-merge-resolver.glade
index 05c1f9c..a9692c3 100644
--- a/conllu-merge-resolver.glade
+++ b/conllu-merge-resolver.glade
@@ -15,7 +15,7 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">CoSMO - CoNLL-U Simple Merge Observer</property>
     <property name="default_width">800</property>
-    <property name="default_height">700</property>
+    <property name="default_height">650</property>
     <child type="titlebar">
       <placeholder/>
     </child>
@@ -245,6 +245,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Copy all attributes from right columns (Alt+R)</property>
                 <property name="relief">none</property>
                 <property name="use_underline">True</property>
                 <style>
@@ -263,6 +264,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Save the solution to this conflict</property>
                 <property name="use_underline">True</property>
                 <style>
                   <class name="colbutton"/>
@@ -279,6 +281,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Find next conflict unsolved (Alt+U)</property>
                 <property name="relief">none</property>
                 <property name="use_underline">True</property>
                 <style>
@@ -347,7 +350,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Go to previous conflict (Alft+Left)</property>
                     <property name="relief">none</property>
+                    <accelerator key="Left" signal="clicked" modifiers="GDK_MOD1_MASK"/>
                     <style>
                       <class name="colbutton"/>
                     </style>
@@ -363,7 +368,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Go to next conflict (Alt+Right)</property>
                     <property name="relief">none</property>
+                    <accelerator key="Right" signal="clicked" modifiers="GDK_MOD1_MASK"/>
                     <style>
                       <class name="colbutton"/>
                     </style>