From 88b2f3b1f1aa8ce2878f3207b104181ad2eb95b1 Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Sat, 3 Sep 2005 12:43:12 +0000
Subject: [PATCH] do some ellipsize via glade2.10 and remove some fixmes
---
src/chat.py | 5 +----
src/groupchat_window.py | 3 ---
src/gtkgui.glade | 6 +++---
src/tabbed_chat_window.py | 8 ++------
src/vcard.py | 11 ++++-------
5 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/src/chat.py b/src/chat.py
index 6f340715a9..26ef8a1b60 100644
--- a/src/chat.py
+++ b/src/chat.py
@@ -180,10 +180,7 @@ class Chat:
else:
close_button.hide()
- #FIXME: when gtk2.4 is OOOOLD do it via glade2.10+
- if gtk.pygtk_version >= (2, 6, 0) and gtk.gtk_version >= (2, 6, 0):
- nickname.set_max_width_chars(10)
-
+ nickname.set_max_width_chars(10)
nickname.set_text(start + self.names[jid])
diff --git a/src/groupchat_window.py b/src/groupchat_window.py
index f61282fcc8..da6d6b04ac 100644
--- a/src/groupchat_window.py
+++ b/src/groupchat_window.py
@@ -1020,9 +1020,6 @@ class GroupchatWindow(chat.Chat):
self.name_labels[room_jid] = self.xmls[room_jid].get_widget(
'banner_name_label')
self.paint_banner(room_jid)
- #FIXME: when gtk2.4 is OOOOLD do it via glade2.10+
- if gtk.pygtk_version >= (2, 6, 0) and gtk.gtk_version >= (2, 6, 0):
- self.name_labels[room_jid].set_ellipsize(pango.ELLIPSIZE_END)
# connect the menuitems to their respective functions
xm = gtk.glade.XML(GTKGUI_GLADE, 'gc_popup_menu', APP)
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 0c6b4d07cd..73108e1d3f 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -9268,7 +9268,7 @@ topic</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">6</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
@@ -9761,7 +9761,7 @@ topic</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label250">
+ <widget class="GtkLabel" id="tab_name_label">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
@@ -10768,7 +10768,7 @@ Status message</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">5</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index a2ba3286ba..152a25fa63 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -145,14 +145,10 @@ timestamp, contact):
name = gtkgui_helpers.escape_for_pango_markup(contact.name)
status = contact.status
- #FIXME: when gtk2.4 is OOOOLD do it via glade2.10+
- if gtk.pygtk_version >= (2, 6, 0) and gtk.gtk_version >= (2, 6, 0) and \
- status is not None:
+
+ if status is not None:
banner_name_label.set_ellipsize(pango.ELLIPSIZE_END)
status = gtkgui_helpers.reduce_chars_newlines(status, 0, 2)
- #FIXME: remove me when gtk24 is OLD
- elif status is not None:
- status = gtkgui_helpers.reduce_chars_newlines(status, 50, 2)
status = gtkgui_helpers.escape_for_pango_markup(status)
diff --git a/src/vcard.py b/src/vcard.py
index 143d6622ed..fea97bc614 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -307,14 +307,11 @@ class VcardWindow:
'resource_prio_label_eventbox')
tip.set_tip(resource_prio_label_eventbox, uf_resources)
+ tip = gtk.Tooltips()
+ status_label_eventbox = self.xml.get_widget('status_label_eventbox')
+ tip.set_tip(status_label_eventbox, stats)
status_label = self.xml.get_widget('status_label')
- #FIXME: when gtk2.4 is OOOOLD do it via glade2.10+
- if gtk.pygtk_version >= (2, 6, 0) and gtk.gtk_version >= (2, 6, 0):
- tip = gtk.Tooltips()
- status_label_eventbox = self.xml.get_widget('status_label_eventbox')
- tip.set_tip(status_label_eventbox, stats)
- status_label.set_max_width_chars(15)
-
+ status_label.set_max_width_chars(15)
status_label.set_text(stats)
gajim.connections[self.account].request_vcard(self.contact.jid)
--
GitLab