diff2.txt

new diff - anonymous -, 09/04/2008 10:18 PM

Download (4.9 KB)

 
1
Index: src/Frontend-GNOME/Chats/GroupChatView.cs
2
===================================================================
3
--- src/Frontend-GNOME/Chats/GroupChatView.cs	(Revision 421)
4
+++ src/Frontend-GNOME/Chats/GroupChatView.cs	(Arbeitskopie)
5
@@ -49,13 +49,13 @@
6
         private Gtk.VBox           _OutputVBox;
7
         private Gtk.Frame          _PersonTreeViewFrame;
8
         private Gtk.HPaned         _OutputHPaned;
9
-        private Gtk.Entry          _TopicEntry;
10
+        private Gtk.Label          _TopicLabel;
11
         private Gtk.TreeViewColumn _IdentityNameColumn;
12
         private Gtk.Image          _TabImage;
13
14
-        public Gtk.Entry TopicEntry {
15
+        public Gtk.Label TopicLabel {
16
             get {
17
-                return _TopicEntry;
18
+                return _TopicLabel;
19
             }
20
         }
21
22
@@ -142,8 +142,9 @@
23
             // topic
24
             _OutputVBox = new Gtk.VBox();
25
26
-            _TopicEntry = new Gtk.Entry();
27
-            _TopicEntry.IsEditable = false;
28
+            _TopicLabel = new Gtk.Label();
29
+            _TopicLabel.UseMarkup = true;
30
+			_TopicLabel.Ellipsize = Pango.EllipsizeMode.End;
31
32
             Add(_OutputHPaned);
33
34
@@ -170,7 +171,7 @@
35
36
             base.Disable();
37
38
-            _TopicEntry.Text = String.Empty;
39
+            _TopicLabel.Markup = String.Empty;
40
             _PersonListStore.Clear();
41
             UpdatePersonCount();
42
         }
43
@@ -258,9 +259,9 @@
44
 #endif
45
             // sync topic
46
             string topic = _GroupChatModel.Topic;
47
-            if ((_TopicEntry != null) &&
48
+            if ((_TopicLabel != null) &&
49
                (topic != null)) {
50
-                _TopicEntry.Text = topic;
51
+                _TopicLabel.Markup = String.Format("<big>{0}</big>", topic);
52
             }
53
54
             base.Sync();
55
@@ -354,37 +355,37 @@
56
57
             if (BackgroundColor != null) {
58
                 _PersonTreeView.ModifyBase(Gtk.StateType.Normal, BackgroundColor.Value);
59
-                _TopicEntry.ModifyBase(Gtk.StateType.Normal, BackgroundColor.Value);
60
+                _TopicLabel.ModifyBase(Gtk.StateType.Normal, BackgroundColor.Value);
61
             } else {
62
                 _PersonTreeView.ModifyBase(Gtk.StateType.Normal);
63
-                _TopicEntry.ModifyBase(Gtk.StateType.Normal);
64
+                _TopicLabel.ModifyBase(Gtk.StateType.Normal);
65
             }
66
67
             if (ForegroundColor != null) {
68
                 _PersonTreeView.ModifyText(Gtk.StateType.Normal, ForegroundColor.Value);
69
-                _TopicEntry.ModifyText(Gtk.StateType.Normal, ForegroundColor.Value);
70
+                _TopicLabel.ModifyText(Gtk.StateType.Normal, ForegroundColor.Value);
71
             } else {
72
                 _PersonTreeView.ModifyText(Gtk.StateType.Normal);
73
-                _TopicEntry.ModifyText(Gtk.StateType.Normal);
74
+                _TopicLabel.ModifyText(Gtk.StateType.Normal);
75
             }
76
77
             _PersonTreeView.ModifyFont(FontDescription);
78
-            _TopicEntry.ModifyFont(FontDescription);
79
+            _TopicLabel.ModifyFont(FontDescription);
80
81
             // topic
82
             string topic_pos = (string) config["Interface/Notebook/Channel/TopicPosition"];
83
-            if (_TopicEntry.IsAncestor(_OutputVBox)) {
84
-                _OutputVBox.Remove(_TopicEntry);
85
+            if (_TopicLabel.IsAncestor(_OutputVBox)) {
86
+                _OutputVBox.Remove(_TopicLabel);
87
             }
88
             if (OutputScrolledWindow.IsAncestor(_OutputVBox)) {
89
                 _OutputVBox.Remove(OutputScrolledWindow);
90
             }
91
             if (topic_pos == "top") {
92
-                _OutputVBox.PackStart(_TopicEntry, false, false, 2);
93
+                _OutputVBox.PackStart(_TopicLabel, false, false, 2);
94
                 _OutputVBox.PackStart(OutputScrolledWindow, true, true, 0);
95
             } else if  (topic_pos == "bottom") {
96
                 _OutputVBox.PackStart(OutputScrolledWindow, true, true, 0);
97
-                _OutputVBox.PackStart(_TopicEntry, false, false, 2);
98
+                _OutputVBox.PackStart(_TopicLabel, false, false, 2);
99
             } else if (topic_pos == "none") {
100
                 _OutputVBox.PackStart(OutputScrolledWindow, true, true, 0);
101
             } else {
102




103
Index: src/Frontend-GNOME/GnomeUI.cs





104
===================================================================





105
--- src/Frontend-GNOME/GnomeUI.cs	(Revision 421)





106
+++ src/Frontend-GNOME/GnomeUI.cs	(Arbeitskopie)





107
@@ -209,8 +209,8 @@





108
                 TraceRemotingCall(mb, ecpage, topic);





109
                 





110
                 GroupChatView cpage = (GroupChatView)Frontend.MainWindow.Notebook.GetChat(ecpage);





111
-                if (cpage.TopicEntry != null) {





112
-                    cpage.TopicEntry.Text = topic;





113
+                if (cpage.TopicLabel != null) {





114
+                    cpage.TopicLabel.Markup = String.Format("<big>{0}</big>", topic);





115
                 }





116
             });





117
         }