Skip to content
Snippets Groups Projects
Commit 5216a4bb authored by nkour's avatar nkour
Browse files

ficking ticket 119. 115 and resizing problems that we had with edit groups... 

ficking ticket 119. 115 and resizing problems that we had with edit groups dialog (now resizes very nicely)
parent 714119db
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
plugins/gtkgui/groupchat_window.py
+ 1
− 1
View file @ 5216a4bb
...@@ -476,7 +476,7 @@ class Groupchat_window(Chat): ...@@ -476,7 +476,7 @@ class Groupchat_window(Chat):
widget.get_selection().unselect_all() widget.get_selection().unselect_all()
return False return False
def on_list_treeview_key_release_event(self, widget, event): def on_list_treeview_key_press_event(self, widget, event):
if event.type == gtk.gdk.KEY_RELEASE: if event.type == gtk.gdk.KEY_RELEASE:
if event.keyval == gtk.keysyms.Escape: if event.keyval == gtk.keysyms.Escape:
widget.get_selection().unselect_all() widget.get_selection().unselect_all()
......
plugins/gtkgui/gtkgui.glade
+ 91
− 105
View file @ 5216a4bb
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
<signal name="row_activated" handler="on_roster_treeview_row_activated" last_modification_time="Mon, 28 Feb 2005 14:18:06 GMT"/> <signal name="row_activated" handler="on_roster_treeview_row_activated" last_modification_time="Mon, 28 Feb 2005 14:18:06 GMT"/>
<signal name="row_expanded" handler="on_roster_treeview_row_expanded" last_modification_time="Mon, 28 Feb 2005 14:18:14 GMT"/> <signal name="row_expanded" handler="on_roster_treeview_row_expanded" last_modification_time="Mon, 28 Feb 2005 14:18:14 GMT"/>
<signal name="row_collapsed" handler="on_roster_treeview_row_collapsed" last_modification_time="Mon, 28 Feb 2005 14:18:33 GMT"/> <signal name="row_collapsed" handler="on_roster_treeview_row_collapsed" last_modification_time="Mon, 28 Feb 2005 14:18:33 GMT"/>
<signal name="key_release_event" handler="on_roster_treeview_key_release_event" last_modification_time="Mon, 28 Feb 2005 14:18:53 GMT"/> <signal name="key_press_event" handler="on_roster_treeview_key_press_event" last_modification_time="Sat, 26 Mar 2005 20:39:36 GMT"/>
</widget> </widget>
</child> </child>
</widget> </widget>
...@@ -7065,7 +7065,7 @@ Custom</property> ...@@ -7065,7 +7065,7 @@ Custom</property>
<signal name="row_collapsed" handler="on_list_treeview_row_collapsed" last_modification_time="Sat, 05 Mar 2005 00:31:52 GMT"/> <signal name="row_collapsed" handler="on_list_treeview_row_collapsed" last_modification_time="Sat, 05 Mar 2005 00:31:52 GMT"/>
<signal name="row_expanded" handler="on_list_treeview_row_expanded" last_modification_time="Sat, 05 Mar 2005 00:31:57 GMT"/> <signal name="row_expanded" handler="on_list_treeview_row_expanded" last_modification_time="Sat, 05 Mar 2005 00:31:57 GMT"/>
<signal name="button_press_event" handler="on_list_treeview_button_press_event" last_modification_time="Sat, 05 Mar 2005 00:32:05 GMT"/> <signal name="button_press_event" handler="on_list_treeview_button_press_event" last_modification_time="Sat, 05 Mar 2005 00:32:05 GMT"/>
<signal name="key_release_event" handler="on_list_treeview_key_release_event" last_modification_time="Sat, 05 Mar 2005 00:32:15 GMT"/> <signal name="key_press_event" handler="on_list_treeview_key_press_event" last_modification_time="Sat, 26 Mar 2005 20:42:24 GMT"/>
</widget> </widget>
</child> </child>
</widget> </widget>
...@@ -8402,59 +8402,24 @@ Custom</property> ...@@ -8402,59 +8402,24 @@ Custom</property>
</child> </child>
<child> <child>
<widget class="GtkVBox" id="vbox51"> <widget class="GtkVBox" id="vbox52">
<property name="border_width">6</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="spacing">5</property> <property name="spacing">0</property>
<child> <child>
<widget class="GtkVBox" id="vbox52"> <widget class="GtkLabel" id="nickname_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="label" translatable="yes"></property>
<property name="spacing">0</property> <property name="use_underline">False</property>
<property name="use_markup">False</property>
<child> <property name="justify">GTK_JUSTIFY_LEFT</property>
<widget class="GtkLabel" id="nickname_label"> <property name="wrap">False</property>
<property name="visible">True</property> <property name="selectable">False</property>
<property name="label" translatable="yes"></property> <property name="xalign">0.5</property>
<property name="use_underline">False</property> <property name="yalign">0.5</property>
<property name="use_markup">False</property> <property name="xpad">0</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="ypad">0</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="jid_label">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
...@@ -8464,46 +8429,50 @@ Custom</property> ...@@ -8464,46 +8429,50 @@ Custom</property>
</child> </child>
<child> <child>
<widget class="GtkHBox" id="hbox2926"> <widget class="GtkLabel" id="jid_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="label" translatable="yes"></property>
<property name="spacing">5</property> <property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child> <child>
<widget class="GtkEntry" id="group_entry"> <widget class="GtkHBox" id="hbox2926">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="homogeneous">False</property>
<property name="editable">True</property> <property name="spacing">5</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
<property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child> <child>
<widget class="GtkButton" id="add_button"> <widget class="GtkEntry" id="group_entry">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="label">gtk-add</property> <property name="editable">True</property>
<property name="use_stock">True</property> <property name="visibility">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property> <property name="max_length">0</property>
<property name="focus_on_click">True</property> <property name="text" translatable="yes"></property>
<signal name="clicked" handler="on_add_button_clicked" last_modification_time="Thu, 17 Mar 2005 11:40:17 GMT"/> <property name="has_frame">True</property>
</widget> <property name="invisible_char">*</property>
<packing> <property name="activates_default">False</property>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
...@@ -8513,29 +8482,19 @@ Custom</property> ...@@ -8513,29 +8482,19 @@ Custom</property>
</child> </child>
<child> <child>
<widget class="GtkScrolledWindow" id="scrolledwindow32"> <widget class="GtkButton" id="add_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="label">gtk-add</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="use_stock">True</property>
<property name="shadow_type">GTK_SHADOW_IN</property> <property name="relief">GTK_RELIEF_NORMAL</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property> <property name="focus_on_click">True</property>
<signal name="clicked" handler="on_add_button_clicked" last_modification_time="Thu, 17 Mar 2005 11:40:17 GMT"/>
<child>
<widget class="GtkTreeView" id="groups_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
</packing> </packing>
</child> </child>
</widget> </widget>
...@@ -8545,6 +8504,33 @@ Custom</property> ...@@ -8545,6 +8504,33 @@ Custom</property>
<property name="fill">False</property> <property name="fill">False</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow32">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTreeView" id="groups_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget> </widget>
</child> </child>
</widget> </widget>
......
plugins/gtkgui/roster_window.py
+ 6
− 6
View file @ 5216a4bb
...@@ -595,7 +595,7 @@ class Roster_window: ...@@ -595,7 +595,7 @@ class Roster_window:
self.contacts[account][jid] = [user1] self.contacts[account][jid] = [user1]
self.add_user_to_roster(jid, account) self.add_user_to_roster(jid, account)
def on_roster_treeview_key_release_event(self, widget, event): def on_roster_treeview_key_press_event(self, widget, event):
"""when a key is pressed in the treeviews""" """when a key is pressed in the treeviews"""
if event.keyval == gtk.keysyms.Escape: if event.keyval == gtk.keysyms.Escape:
self.tree.get_selection().unselect_all() self.tree.get_selection().unselect_all()
...@@ -625,9 +625,9 @@ class Roster_window: ...@@ -625,9 +625,9 @@ class Roster_window:
return False return False
def on_roster_treeview_button_press_event(self, widget, event): def on_roster_treeview_button_press_event(self, widget, event):
"""popup user's group's or agent menu""" """popup contact's , group's or agent's menu"""
if event.type == gtk.gdk.BUTTON_PRESS: if event.type == gtk.gdk.BUTTON_PRESS:
if event.button == 3: if event.button == 3: # Right click
try: try:
path, column, x, y = self.tree.get_path_at_pos(int(event.x), \ path, column, x, y = self.tree.get_path_at_pos(int(event.x), \
int(event.y)) int(event.y))
...@@ -645,8 +645,9 @@ class Roster_window: ...@@ -645,8 +645,9 @@ class Roster_window:
self.mk_menu_user(event, iter) self.mk_menu_user(event, iter)
elif type == 'account': elif type == 'account':
self.mk_menu_account(event, iter) self.mk_menu_account(event, iter)
return True #return True
if event.button == 1: return False
if event.button == 1: # Left click
try: try:
path, column, x, y = self.tree.get_path_at_pos(int(event.x), \ path, column, x, y = self.tree.get_path_at_pos(int(event.x), \
int(event.y)) int(event.y))
...@@ -893,7 +894,6 @@ class Roster_window: ...@@ -893,7 +894,6 @@ class Roster_window:
def on_preferences_menuitem_activate(self, widget): def on_preferences_menuitem_activate(self, widget):
"""When preferences is selected : """When preferences is selected :
call the preferences_window class""" call the preferences_window class"""
print self.plugin.windows['preferences'].window.get_property('visible')
if self.plugin.windows['preferences'].window.get_property('visible'): if self.plugin.windows['preferences'].window.get_property('visible'):
self.plugin.windows['preferences'].window.present() self.plugin.windows['preferences'].window.present()
else: else:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment