diff --git a/src/advanced.py b/src/advanced.py
index 37495491d..bf86b3202 100644
--- a/src/advanced.py
+++ b/src/advanced.py
@@ -34,7 +34,7 @@ OPT_VAL = 1
GTKGUI_GLADE = 'gtkgui.glade'
-class Advanced_configuration_window:
+class AdvancedConfigurationWindow:
def __init__(self, plugin):
self.plugin = plugin
diff --git a/src/chat.py b/src/chat.py
index ac2a1608a..bf4fea260 100644
--- a/src/chat.py
+++ b/src/chat.py
@@ -799,15 +799,5 @@ class Chat:
# iterate through tabs/windows and repaint
for jid in self.xmls:
- if self.widget_name == 'tabbed_chat_window':
- self.xmls[jid].get_widget('banner_status_eventbox').modify_bg(
- gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor))
- self.xmls[jid].get_widget('banner_typing_eventbox').modify_bg(
- gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor))
- self.xmls[jid].get_widget('banner_name_eventbox').modify_bg(
- gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor))
- self.xmls[jid].get_widget('banner_avatar_eventbox').modify_bg(
- gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor))
- elif self.widget_name == 'groupchat_window':
- self.xmls[jid].get_widget('banner_name_eventbox').modify_bg(
+ self.xmls[jid].get_widget('banner_eventbox').modify_bg(
gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor))
diff --git a/src/config.py b/src/config.py
index c0addd8bb..a86933df4 100644
--- a/src/config.py
+++ b/src/config.py
@@ -952,7 +952,7 @@ class PreferencesWindow:
self.plugin.windows['advanced_config'].window.present()
else:
self.plugin.windows['advanced_config'] = \
- dialogs.Advanced_configuration_window(self.plugin)
+ dialogs.AdvancedConfigurationWindow(self.plugin)
#---------- AccountModificationWindow class -------------#
class AccountModificationWindow:
@@ -1261,7 +1261,7 @@ _('To change the account name, it must be disconnected.')).get_response()
return
if not self.plugin.windows[self.account]['infos'].has_key('vcard'):
self.plugin.windows[self.account]['infos'][jid] = \
- dialogs.Vcard_window(jid, self.plugin, self.account, True)
+ dialogs.VcardWindow(jid, self.plugin, self.account, True)
gajim.connections[self.account].request_vcard(jid)
def on_manage_proxies_button_clicked(self, widget):
diff --git a/src/dialogs.py b/src/dialogs.py
index 120cb52dd..ecf629cea 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -22,9 +22,9 @@ import gtk.glade
import gobject
import os
-from vcard import Vcard_window
+from vcard import VcardWindow
from gajim_themes_window import GajimThemesWindow
-from advanced import Advanced_configuration_window
+from advanced import AdvancedConfigurationWindow
from gajim import User
from common import gajim
from common import helpers
@@ -535,7 +535,7 @@ class Subscription_request_window:
self.plugin.windows[self.account]['infos'][self.jid].window.present()
else:
self.plugin.windows[self.account]['infos'][self.jid] = \
- Vcard_window(self.jid, self.plugin, self.account, True)
+ VcardWindow(self.jid, self.plugin, self.account, True)
#remove the publish / retrieve buttons
vcard_xml = self.plugin.windows[self.account]['infos'][self.jid].xml
hbuttonbox = vcard_xml.get_widget('information_hbuttonbox')
diff --git a/src/gajim.py b/src/gajim.py
index 7d5935665..d2ba1e00b 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -807,7 +807,7 @@ class Interface:
#2:autoaway and use sleeper
#3:autoxa and use sleeper
- self.roster = roster_window.Roster_window(self)
+ self.roster = roster_window.RosterWindow(self)
path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps/gajim.png')
pix = gtk.gdk.pixbuf_new_from_file(path_to_file)
gtk.window_set_default_icon(pix) # set the icon to all newly opened windows
diff --git a/src/groupchat_window.py b/src/groupchat_window.py
index 9766a80d5..7d35ef03e 100644
--- a/src/groupchat_window.py
+++ b/src/groupchat_window.py
@@ -37,7 +37,7 @@ gtk.glade.textdomain(APP)
GTKGUI_GLADE = 'gtkgui.glade'
-class Groupchat_window(chat.Chat):
+class GroupchatWindow(chat.Chat):
"""Class for Groupchat window"""
def __init__(self, room_jid, nick, plugin, account):
chat.Chat.__init__(self, plugin, account, 'groupchat_window')
@@ -513,7 +513,7 @@ class Groupchat_window(chat.Chat):
self.plugin.windows[self.account]['infos'][jid].window.present()
else:
self.plugin.windows[self.account]['infos'][jid] = \
- dialogs.Vcard_window(jid, self.plugin, self.account, True)
+ dialogs.VcardWindow(jid, self.plugin, self.account, True)
# FIXME: when we'll have a user for each contact, this won't be needed
# cause we'll user real information window
vcard_xml = self.plugin.windows[self.account]['infos'][jid].xml
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 41628e4cf..9c8bdfabd 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -8167,16 +8167,16 @@ Custom
-
+
True
- False
- 0
+ True
+ False
-
+
True
- True
- False
+ False
+ 0
@@ -8193,237 +8193,152 @@ This is the subject.
0
6
-
-
-
- 3
- False
- True
-
-
-
-
-
- True
- True
- 495
-
-
-
- 150
- True
- False
- 6
-
-
-
- True
- True
-
-
-
- 200
- True
- True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- 3
- True
- True
- False
- False
- True
- GTK_JUSTIFY_LEFT
- GTK_WRAP_WORD
- False
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
-
-
-
- False
- True
-
-
-
-
-
- 45
- True
- True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- 3
- True
- True
- True
- False
- True
- GTK_JUSTIFY_LEFT
- GTK_WRAP_WORD
- True
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
- False
- False
+ 3
+ False
+ True
-
- 100
+
True
- GTK_POLICY_NEVER
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
+ True
+ 495
-
- 3
+
+ 150
True
- True
- False
- False
- False
- True
-
-
-
-
-
-
-
-
-
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- 2
- True
- False
- 0
-
-
-
- True
- GTK_ORIENTATION_HORIZONTAL
- GTK_TOOLBAR_ICONS
- True
- True
-
-
-
- True
- True
- True
- True
-
-
- False
False
+ 6
+
+
+
+ True
+ True
+
+
+
+ 200
+ True
+ True
+ GTK_POLICY_AUTOMATIC
+ GTK_POLICY_AUTOMATIC
+ GTK_SHADOW_IN
+ GTK_CORNER_TOP_LEFT
+
+
+
+ 3
+ True
+ True
+ False
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ GTK_WRAP_WORD
+ False
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+ False
+ True
+
+
+
+
+
+ 45
+ True
+ True
+ GTK_POLICY_AUTOMATIC
+ GTK_POLICY_AUTOMATIC
+ GTK_SHADOW_IN
+ GTK_CORNER_TOP_LEFT
+
+
+
+ 3
+ True
+ True
+ True
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ GTK_WRAP_WORD
+ True
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+
+
+
+ False
+ False
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+ False
+ False
-
+
+ 100
True
- Bold
- gtk-bold
- True
- True
- False
- False
-
-
- False
- True
-
-
+ GTK_POLICY_NEVER
+ GTK_POLICY_AUTOMATIC
+ GTK_SHADOW_IN
+ GTK_CORNER_TOP_LEFT
-
-
- True
- Italics
- gtk-italic
- True
- True
- False
- False
+
+
+ 3
+ True
+ True
+ False
+ False
+ False
+ True
+
+
+
+
+
+
+
- False
- True
-
-
-
-
-
- True
- Underline
- gtk-underline
- True
- True
- False
- False
-
-
- False
- True
+ False
+ False
@@ -8435,241 +8350,331 @@ This is the subject.
-
+
+ 2
True
False
- 2
+ 0
-
+
True
- True
- GTK_RELIEF_NORMAL
- True
+ GTK_ORIENTATION_HORIZONTAL
+ GTK_TOOLBAR_ICONS
+ True
+ True
-
+
True
- 0.5
- 0.5
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- True
- False
- 2
-
-
-
- True
- gtk-preferences
- 4
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- _Actions
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
+ True
+ True
+ True
+
+ False
+ False
+
+
+
+
+
+ True
+ Bold
+ gtk-bold
+ True
+ True
+ False
+ False
+
+
+ False
+ True
+
+
+
+
+
+ True
+ Italics
+ gtk-italic
+ True
+ True
+ False
+ False
+
+
+ False
+ True
+
+
+
+
+
+ True
+ Underline
+ gtk-underline
+ True
+ True
+ False
+ False
+
+
+ False
+ True
+
0
- False
- False
-
-
-
-
-
- True
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
- True
- 0.5
- 0.5
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- True
- False
- 2
-
-
-
- True
- gtk-justify-fill
- 4
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- _History
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
-
-
- 2
- False
+ True
True
-
+
True
- True
- GTK_RELIEF_NORMAL
- True
+ False
+ 2
-
+
True
- 0.5
- 0.5
- 0
- 0
- 0
- 0
- 0
- 0
+ True
+ GTK_RELIEF_NORMAL
+ True
-
+
True
- False
- 2
+ 0.5
+ 0.5
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
-
+
True
- gtk-jump-to
- 4
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
+ False
+ 2
-
-
- True
- _Send
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
+
+
+ True
+ gtk-preferences
+ 4
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ _Actions
+ True
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
-
- 0
- False
- False
-
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+
+ True
+ 0.5
+ 0.5
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+ True
+ False
+ 2
+
+
+
+ True
+ gtk-justify-fill
+ 4
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ _History
+ True
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+
+
+ 2
+ False
+ True
+
+
+
+
+
+ True
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+
+ True
+ 0.5
+ 0.5
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+ True
+ False
+ 2
+
+
+
+ True
+ gtk-jump-to
+ 4
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ _Send
+ True
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+
+
+
+ 0
+ False
+ False
+
0
False
- False
+ True
@@ -8680,11 +8685,6 @@ This is the subject.
-
- 0
- False
- True
-
@@ -9589,19 +9589,17 @@ This is the subject.
1
-
- 3
+
True
- False
- 0
+ True
+ False
-
- 40
- 40
+
+ 3
True
- True
- False
+ False
+ 0
@@ -9611,21 +9609,12 @@ This is the subject.
0
0
+
+ 0
+ False
+ False
+
-
-
- 0
- False
- False
-
-
-
-
-
- 10
- True
- True
- False
@@ -9635,20 +9624,12 @@ This is the subject.
0
0
+
+ 0
+ False
+ False
+
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- False
@@ -9665,22 +9646,12 @@ JID: whatever@jabber.org
0
5
+
+ 0
+ True
+ True
+
-
-
- 0
- True
- True
-
-
-
-
-
- 40
- 40
- True
- True
- False
@@ -9690,13 +9661,13 @@ JID: whatever@jabber.org
0
0
+
+ 5
+ False
+ False
+
-
- 0
- False
- False
-
diff --git a/src/history_window.py b/src/history_window.py
index 592298190..b8298ee27 100644
--- a/src/history_window.py
+++ b/src/history_window.py
@@ -31,7 +31,7 @@ gtk.glade.textdomain(APP)
GTKGUI_GLADE = 'gtkgui.glade'
-class History_window:
+class HistoryWindow:
"""Class for bowser agent window:
to know the agents on the selected server"""
def on_history_window_destroy(self, widget):
diff --git a/src/roster_window.py b/src/roster_window.py
index 791d7d595..fa23554aa 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -44,7 +44,7 @@ gtk.glade.textdomain(APP)
GTKGUI_GLADE = 'gtkgui.glade'
-class Roster_window:
+class RosterWindow:
'''Class for main window of gtkgui plugin'''
def get_account_iter(self, name):
@@ -450,7 +450,7 @@ class Roster_window:
if info.has_key(user.jid):
info[user.jid].window.present()
else:
- info[user.jid] = dialogs.Vcard_window(user, self.plugin,
+ info[user.jid] = dialogs.VcardWindow(user, self.plugin,
account)
def on_agent_logging(self, widget, jid, state, account):
@@ -521,7 +521,7 @@ class Roster_window:
self.plugin.windows['logs'][user.jid].window.present()
else:
self.plugin.windows['logs'][user.jid] = history_window.\
- History_window(self.plugin, user.jid)
+ HistoryWindow(self.plugin, user.jid)
def mk_menu_user(self, event, iter):
'''Make user's popup menu'''
@@ -974,7 +974,7 @@ class Roster_window:
if gajim.config.get('usetabbedchat'):
if not self.plugin.windows[account]['chats'].has_key('tabbed'):
self.plugin.windows[account]['chats']['tabbed'] = \
- tabbed_chat_window.Tabbed_chat_window(user, self.plugin, account)
+ tabbed_chat_window.TabbedChatWindow(user, self.plugin, account)
else:
self.plugin.windows[account]['chats']['tabbed'].new_user(user)
@@ -982,13 +982,13 @@ class Roster_window:
self.plugin.windows[account]['chats']['tabbed']
else:
self.plugin.windows[account]['chats'][user.jid] = \
- tabbed_chat_window.Tabbed_chat_window(user, self.plugin, account)
+ tabbed_chat_window.TabbedChatWindow(user, self.plugin, account)
def new_room(self, jid, nick, account):
if gajim.config.get('usetabbedchat'):
if not self.plugin.windows[account]['gc'].has_key('tabbed'):
self.plugin.windows[account]['gc']['tabbed'] = \
- groupchat_window.Groupchat_window(jid, nick, self.plugin,
+ groupchat_window.GroupchatWindow(jid, nick, self.plugin,
account)
else:
self.plugin.windows[account]['gc']['tabbed'].new_room(jid, nick)
@@ -996,7 +996,7 @@ class Roster_window:
self.plugin.windows[account]['gc']['tabbed']
else:
self.plugin.windows[account]['gc'][jid] = \
- groupchat_window.Groupchat_window(jid, nick, self.plugin, account)
+ groupchat_window.GroupchatWindow(jid, nick, self.plugin, account)
def on_message(self, jid, msg, tim, account, encrypted = False):
'''when we receive a message'''
diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index 77b462c6f..befd7e82d 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -40,7 +40,7 @@ gtk.glade.textdomain(APP)
GTKGUI_GLADE = 'gtkgui.glade'
-class Tabbed_chat_window(chat.Chat):
+class TabbedChatWindow(chat.Chat):
"""Class for tabbed chat window"""
def __init__(self, user, plugin, account):
chat.Chat.__init__(self, plugin, account, 'tabbed_chat_window')
@@ -102,22 +102,12 @@ class Tabbed_chat_window(chat.Chat):
# setting the bg color of the eventboxes. There is a
# separate event box for each component (name label and
# status icon). The avatar has one too in the glade file.
-
+ self.xmls[jid].get_widget('banner_eventbox').modify_bg(
+ gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor))
# setup the label that holds name and jid
banner_name_label = self.xmls[jid].get_widget('banner_name_label')
- banner_name_label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"))
+ banner_name_label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse('white'))
banner_name_label.set_markup(label_text)
- # setup the eventbox that holds the above label, and colour it
- banner_name_eventbox = self.xmls[jid].get_widget('banner_name_eventbox')
- banner_name_eventbox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor))
-
- # setup the eventbox that holds the status icon and colour it
- banner_status_eventbox = self.xmls[jid].get_widget('banner_status_eventbox')
- banner_status_eventbox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor))
-
- # setup the eventbox that holds the avatar and colour it
- banner_avatar_eventbox = self.xmls[jid].get_widget('banner_avatar_eventbox')
- banner_avatar_eventbox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor))
def set_avatar(self, vcard):
if not vcard.has_key('PHOTO'):
@@ -208,7 +198,7 @@ class Tabbed_chat_window(chat.Chat):
self.plugin.windows['logs'][jid].window.present()
else:
self.plugin.windows['logs'][jid] = history_window.\
- History_window(self.plugin, jid, self.account)
+ HistoryWindow(self.plugin, jid, self.account)
def on_send_button_clicked(self, widget):
"""When send button is pressed: send the current message"""
diff --git a/src/vcard.py b/src/vcard.py
index bca4b5d82..17f7f30e3 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -1,4 +1,4 @@
-## vcard.py (has Vcard_window class)
+## vcard.py (has VcardWindow class)
##
## Gajim Team:
## - Yann Le Boulanger
@@ -33,7 +33,7 @@ gtk.glade.textdomain (APP)
GTKGUI_GLADE = 'gtkgui.glade'
-class Vcard_window:
+class VcardWindow:
'''Class for contact's information window'''
def on_user_information_window_destroy(self, widget = None):
del self.plugin.windows[self.account]['infos'][self.jid]