diff --git a/src/common/config.py b/src/common/config.py
index f74d65894..9442b49ef 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -140,7 +140,6 @@ class Config:
'last_send_dir': [opt_str, ''],
'last_emoticons_dir': [opt_str, ''],
'last_sounds_dir': [opt_str, ''],
- #FIXME: add combobox in prefs for this in .9
'tabs_position': [opt_str, 'top', _('Where to show tabs. Values are:')+" 'top', 'bottom', 'left', 'right'."],
'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')],
'tabs_border': [opt_bool, False, _('Show tab border if one conversation?')],
diff --git a/src/config.py b/src/config.py
index 0e626999c..1139efad2 100644
--- a/src/config.py
+++ b/src/config.py
@@ -178,6 +178,16 @@ class PreferencesWindow:
st = gajim.config.get('usetabbedchat')
self.xml.get_widget('use_tabbed_chat_window_checkbutton').set_active(st)
+ st = gajim.config.get('tabs_position')
+ sel = 0
+ if st == 'bottom':
+ sel = 1
+ elif st == 'left':
+ sel = 2
+ elif st == 'right':
+ sel = 3
+ self.xml.get_widget('tabs_pos_combobox').set_active(sel)
+
# always compact view
st = gajim.config.get('always_compact_view')
self.xml.get_widget('always_compact_view_checkbutton').set_active(st)
@@ -609,16 +619,31 @@ class PreferencesWindow:
self.plugin.save_config()
def on_use_tabbed_chat_window_checkbutton_toggled(self, widget):
+ tabs_pos_label = self.xml.get_widget('tabs_pos_label')
+ tabs_pos_combobox = self.xml.get_widget('tabs_pos_combobox')
+ self.on_checkbutton_toggled(widget, 'usetabbedchat',
+ [tabs_pos_label, tabs_pos_combobox])
+
if widget.get_active():
- gajim.config.set('usetabbedchat', True)
self.merge_windows('chats')
self.merge_windows('gc')
else:
- gajim.config.set('usetabbedchat', False)
self.split_windows('chats')
self.split_windows('gc')
self.plugin.save_config()
+ def on_tabs_pos_combobox_changed(self, widget):
+ sel = widget.get_active()
+ if sel == 1:
+ st = 'bottom'
+ elif sel == 2:
+ st = 'left'
+ elif sel == 3:
+ st = 'right'
+ else:
+ st = 'top'
+ gajim.config.set('tabs_position', st)
+
def on_always_compact_view_checkbutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'always_compact_view')
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 74c1adead..c2a7c13ef 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -3508,22 +3508,79 @@
6
-
+
True
- True
- Use a single chat window with _tabs
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
+ False
+ 12
+
+
+
+ True
+ True
+ Use a single chat window with _tabs
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ Po_sition:
+ True
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+ tabs_pos_combobox
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ Top
+Bottom
+Left
+Right
+ False
+ True
+
+
+
+ 0
+ False
+ False
+
+
0
False
- False
+ True