diff --git a/data/glade/preferences_window.glade b/data/glade/preferences_window.glade
index ba600a7d1..8548bf96d 100644
--- a/data/glade/preferences_window.glade
+++ b/data/glade/preferences_window.glade
@@ -494,7 +494,7 @@ Per type
True
- Treat incoming and single messages as:
+ Treat all incoming messages as:
False
False
GTK_JUSTIFY_LEFT
@@ -728,231 +728,15 @@ Single message
-
-
- True
- False
- 6
-
-
-
- True
- Time Stamp:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- 30
- True
- True
- GTK_POLICY_NEVER
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- True
- False
- True
- GTK_JUSTIFY_LEFT
- GTK_WRAP_CHAR
- True
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- True
- True
-
-
-
-
- 0
- False
- True
-
-
-
True
- 5
+ 4
4
False
6
12
-
-
- True
- B_efore nickname:
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- scrolledwindow27
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 0
- 1
- fill
-
-
-
-
-
-
- 30
- True
- True
- GTK_POLICY_NEVER
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- True
- False
- True
- GTK_JUSTIFY_LEFT
- GTK_WRAP_CHAR
- True
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 1
- 2
- 0
- 1
- fill
-
-
-
-
-
-
- True
- A_fter nickname:
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- scrolledwindow28
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 2
- 3
- 0
- 1
- fill
-
-
-
-
-
-
- 30
- True
- True
- GTK_POLICY_NEVER
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- True
- True
- True
- False
- True
- GTK_JUSTIFY_LEFT
- GTK_WRAP_CHAR
- True
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 3
- 4
- 0
- 1
- fill
-
-
-
-
True
@@ -975,8 +759,8 @@ Single message
0
1
- 1
- 2
+ 0
+ 1
fill
@@ -996,8 +780,8 @@ Single message
1
2
- 1
- 2
+ 0
+ 1
@@ -1025,8 +809,8 @@ Single message
2
3
- 1
- 2
+ 0
+ 1
fill
@@ -1043,78 +827,13 @@ Single message
3
4
- 1
- 2
+ 0
+ 1
fill
-
-
- True
- True
- False
- True
-
-
-
- 3
- 4
- 2
- 3
- fill
-
-
-
-
-
-
- True
- _URL:
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- url_msg_colorbutton
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 2
- 3
- 2
- 3
- fill
-
-
-
-
-
-
- True
- True
- False
- True
-
-
-
- 1
- 2
- 2
- 3
-
-
-
-
-
True
@@ -1137,8 +856,73 @@ Single message
0
1
- 2
- 3
+ 1
+ 2
+ fill
+
+
+
+
+
+
+ True
+ True
+ False
+ True
+
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+
+
+ True
+ _URL:
+ True
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ url_msg_colorbutton
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 2
+ 3
+ 1
+ 2
+ fill
+
+
+
+
+
+
+ True
+ True
+ False
+ True
+
+
+
+ 3
+ 4
+ 1
+ 2
fill
@@ -1257,8 +1041,8 @@ Single message
0
4
- 3
- 4
+ 2
+ 3
fill
@@ -1316,8 +1100,8 @@ Single message
0
2
- 4
- 5
+ 3
+ 4
fill
@@ -1338,8 +1122,8 @@ Single message
2
4
- 4
- 5
+ 3
+ 4
fill
diff --git a/src/config.py b/src/config.py
index a9d24384d..325a31a4a 100644
--- a/src/config.py
+++ b/src/config.py
@@ -92,14 +92,14 @@ class PreferencesWindow:
w.set_no_show_all(True)
w.hide()
- #trayicon
+ # trayicon
if gajim.interface.systray_capabilities:
st = gajim.config.get('trayicon')
self.trayicon_checkbutton.set_active(st)
else:
self.trayicon_checkbutton.set_sensitive(False)
- #Save position
+ # Save position
st = gajim.config.get('saveposition')
self.xml.get_widget('save_position_checkbutton').set_active(st)
@@ -240,21 +240,6 @@ class PreferencesWindow:
else:
self.xml.get_widget('time_always_radiobutton').set_active(True)
- # TimeStamp
- st = gajim.config.get('time_stamp')
- st = helpers.from_one_line(st)
- self.xml.get_widget('time_stamp_textview').get_buffer().set_text(st)
-
- # before nickname
- st = gajim.config.get('before_nickname')
- st = helpers.from_one_line(st)
- self.xml.get_widget('before_nickname_textview').get_buffer().set_text(st)
-
- # after nickanme
- st = gajim.config.get('after_nickname')
- st = helpers.from_one_line(st)
- self.xml.get_widget('after_nickname_textview').get_buffer().set_text(st)
-
# Color for incoming messages
colSt = gajim.config.get('inmsgcolor')
self.xml.get_widget('incoming_msg_colorbutton').set_color(
@@ -733,29 +718,6 @@ class PreferencesWindow:
self._set_sensitivity_for_before_after_time_widgets(True)
gajim.interface.save_config()
- def _get_textview_text(self, tv):
- buffer = tv.get_buffer()
- begin, end = buffer.get_bounds()
- return buffer.get_text(begin, end).decode('utf-8')
-
- def on_time_stamp_textview_focus_out_event(self, widget, event):
- text = self._get_textview_text(widget)
- text = helpers.to_one_line(text)
- gajim.config.set('time_stamp', text)
- gajim.interface.save_config()
-
- def on_before_nickname_textview_focus_out_event(self, widget, event):
- text = self._get_textview_text(widget)
- text = helpers.to_one_line(text)
- gajim.config.set('before_nickname', text)
- gajim.interface.save_config()
-
- def on_after_nickname_textview_focus_out_event(self, widget, event):
- text = self._get_textview_text(widget)
- text = helpers.to_one_line(text)
- gajim.config.set('after_nickname', text)
- gajim.interface.save_config()
-
def update_text_tags(self):
'''Update color tags in Opened Chat Windows'''
for win in gajim.interface.msg_win_mgr.windows():