aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2019-03-16 22:25:46 +0100
committerfiaxh <git@lightrise.org>2019-03-18 13:51:57 +0100
commit330649a5372880d14a12ea37af948c7acbbc6a3d (patch)
tree9c90c14a52332a5ebf50070b9f5f12d390d55caf
parent26a8538e97f94cae8ba75c6cacfcc70cc5c2f6a4 (diff)
downloaddino-330649a5372880d14a12ea37af948c7acbbc6a3d.tar.gz
dino-330649a5372880d14a12ea37af948c7acbbc6a3d.zip
Add headerbar button tooltips, don't remove relief
-rw-r--r--main/data/conversation_list_titlebar.ui1
-rw-r--r--main/data/conversation_list_titlebar_csd.ui2
-rw-r--r--main/src/ui/conversation_titlebar/menu_entry.vala5
-rw-r--r--main/src/ui/conversation_titlebar/occupants_entry.vala1
-rw-r--r--main/src/ui/conversation_titlebar/search_entry.vala2
-rw-r--r--main/src/ui/conversation_titlebar/view_csd.vala1
6 files changed, 9 insertions, 3 deletions
diff --git a/main/data/conversation_list_titlebar.ui b/main/data/conversation_list_titlebar.ui
index bc490e4b..36ad0656 100644
--- a/main/data/conversation_list_titlebar.ui
+++ b/main/data/conversation_list_titlebar.ui
@@ -13,6 +13,7 @@
<property name="visible">True</property>
<child>
<object class="GtkMenuButton" id="add_button">
+ <property name="tooltip_text" translatable="yes">Start Conversation</property>
<property name="relief">none</property>
<property name="visible">True</property>
<child>
diff --git a/main/data/conversation_list_titlebar_csd.ui b/main/data/conversation_list_titlebar_csd.ui
index b87cd893..607f81cc 100644
--- a/main/data/conversation_list_titlebar_csd.ui
+++ b/main/data/conversation_list_titlebar_csd.ui
@@ -9,6 +9,7 @@
</style>
<child>
<object class="GtkMenuButton" id="add_button">
+ <property name="tooltip_text" translatable="yes">Start Conversation</property>
<property name="visible">True</property>
<child>
<object class="GtkImage">
@@ -24,7 +25,6 @@
</child>
<child>
<object class="GtkMenuButton" id="menu_button">
- <property name="relief">none</property>
<property name="valign">center</property>
<property name="visible">True</property>
<child>
diff --git a/main/src/ui/conversation_titlebar/menu_entry.vala b/main/src/ui/conversation_titlebar/menu_entry.vala
index e62989a0..daee48c2 100644
--- a/main/src/ui/conversation_titlebar/menu_entry.vala
+++ b/main/src/ui/conversation_titlebar/menu_entry.vala
@@ -42,6 +42,11 @@ class MenuWidget : Button, Plugins.ConversationTitlebarWidget {
public new void set_conversation(Conversation conversation) {
this.conversation = conversation;
+ if (conversation.type_ == Conversation.Type.GROUPCHAT) {
+ tooltip_text = "Channel details";
+ } else {
+ tooltip_text = "Conversation details";
+ }
}
}
diff --git a/main/src/ui/conversation_titlebar/occupants_entry.vala b/main/src/ui/conversation_titlebar/occupants_entry.vala
index af553e35..b5c4c228 100644
--- a/main/src/ui/conversation_titlebar/occupants_entry.vala
+++ b/main/src/ui/conversation_titlebar/occupants_entry.vala
@@ -34,6 +34,7 @@ class OccupantsWidget : MenuButton, Plugins.ConversationTitlebarWidget {
public OccupantsWidget(StreamInteractor stream_interactor) {
image = new Image.from_icon_name("system-users-symbolic", IconSize.MENU);
+ tooltip_text = _("Members");
this.stream_interactor = stream_interactor;
set_use_popover(true);
diff --git a/main/src/ui/conversation_titlebar/search_entry.vala b/main/src/ui/conversation_titlebar/search_entry.vala
index ff0ff325..9fab0614 100644
--- a/main/src/ui/conversation_titlebar/search_entry.vala
+++ b/main/src/ui/conversation_titlebar/search_entry.vala
@@ -8,7 +8,7 @@ namespace Dino.Ui {
public class SearchMenuEntry : Plugins.ConversationTitlebarEntry, Object {
public string id { get { return "search"; } }
- public GlobalSearchButton search_button = new GlobalSearchButton() { visible = true };
+ public GlobalSearchButton search_button = new GlobalSearchButton() { tooltip_text=_("Search messages"), visible = true };
public SearchMenuEntry() {
search_button.set_image(new Gtk.Image.from_icon_name("system-search-symbolic", Gtk.IconSize.MENU) { visible = true });
diff --git a/main/src/ui/conversation_titlebar/view_csd.vala b/main/src/ui/conversation_titlebar/view_csd.vala
index 26231a4c..62360c42 100644
--- a/main/src/ui/conversation_titlebar/view_csd.vala
+++ b/main/src/ui/conversation_titlebar/view_csd.vala
@@ -28,7 +28,6 @@ public class ConversationTitlebarCsd : Gtk.HeaderBar {
}
foreach (var w in widgets) {
Button gtk_widget = (Gtk.Button)w;
- gtk_widget.relief = ReliefStyle.NONE;
this.pack_end(gtk_widget);
}
}