EmoticonsPackPlugin.coding style

This commit is contained in:
Denis Fomin
2013-05-01 00:14:14 +04:00
parent 9ede8bf256
commit 1e5c57459b
2 changed files with 64 additions and 97 deletions

View File

@@ -264,132 +264,105 @@
<object class="GtkHBox" id="hbox15"> <object class="GtkHBox" id="hbox15">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="homogeneous">True</property>
<child> <child>
<object class="GtkHButtonBox" id="hbuttonbox1"> <object class="GtkButton" id="inslall_upgrade_button">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="layout_style">end</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<signal name="clicked" handler="on_inslall_upgrade_clicked" swapped="no"/>
<child> <child>
<object class="GtkButton" id="legend_button"> <object class="GtkHBox" id="hbox1">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="margin_left">22</property>
<property name="use_action_appearance">False</property>
<signal name="clicked" handler="on_legend_button_clicked" swapped="no"/>
<child> <child>
<object class="GtkHBox" id="hbox2"> <object class="GtkImage" id="image1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <property name="stock">gtk-refresh</property>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-info</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Legend</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Install/Upgrade</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
<property name="non_homogeneous">True</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkHButtonBox" id="hbuttonbox3"> <object class="GtkButton" id="legend_button">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="layout_style">end</property> <property name="receives_default">True</property>
<property name="margin_left">22</property>
<property name="use_action_appearance">False</property>
<signal name="clicked" handler="on_legend_button_clicked" swapped="no"/>
<child> <child>
<object class="GtkButton" id="inslall_upgrade_button"> <object class="GtkHBox" id="hbox2">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<signal name="clicked" handler="on_inslall_upgrade_clicked" swapped="no"/>
<child> <child>
<object class="GtkHBox" id="hbox1"> <object class="GtkImage" id="image2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <property name="stock">gtk-info</property>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-refresh</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Install/Upgrade</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Legend</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">False</property> <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">True</property>
<property name="position">5</property> <property name="position">5</property>
</packing> </packing>
</child> </child>

View File

@@ -120,8 +120,7 @@ class EmoticonsPackPlugin(GajimPlugin):
self.available_treeview.append_column(col) self.available_treeview.append_column(col)
selection = self.available_treeview.get_selection() selection = self.available_treeview.get_selection()
selection.connect( selection.connect('changed', self.emoticons_treeview_selection_changed)
'changed', self.available_emoticons_treeview_selection_changed)
selection.set_mode(Gtk.SelectionMode.SINGLE) selection.set_mode(Gtk.SelectionMode.SINGLE)
self.emoticons_description_textview = ConversationTextview(None) self.emoticons_description_textview = ConversationTextview(None)
@@ -187,14 +186,8 @@ class EmoticonsPackPlugin(GajimPlugin):
self.tmp_dir, name, 'preview.png'))) self.tmp_dir, name, 'preview.png')))
self.emoticons_description_textview.tv.display_html( self.emoticons_description_textview.tv.display_html(
desc, self.emoticons_description_textview) desc, self.emoticons_description_textview)
self.emoticons_description_textview.tv.set_property('sensitive', True) self.emoticons_description_textview.tv.set_property(
'sensitive', True)
def dict_to_html(self, dict_):
desc = ''
for icon in dict_:
acr = ' , '.join(dict_[icon])
desc += ' '+ icon + ' '+ acr + '\n'
return desc
def on_inslall_upgrade_clicked(self, widget): def on_inslall_upgrade_clicked(self, widget):
self.inslall_upgrade_button.set_property('sensitive', False) self.inslall_upgrade_button.set_property('sensitive', False)
@@ -300,7 +293,7 @@ class EmoticonsPackPlugin(GajimPlugin):
conf.get(section, 'homepage'), False]) conf.get(section, 'homepage'), False])
conf.remove_section(section) conf.remove_section(section)
def available_emoticons_treeview_selection_changed(self, treeview_selection): def emoticons_treeview_selection_changed(self, treeview_selection):
model, iter = treeview_selection.get_selected() model, iter = treeview_selection.get_selected()
label = self.xml.get_object('label2') label = self.xml.get_object('label2')
label.set_text(_('Legend')) label.set_text(_('Legend'))
@@ -343,7 +336,8 @@ class EmoticonsPackPlugin(GajimPlugin):
self.tmp_dir, set_name, 'preview.png'))) self.tmp_dir, set_name, 'preview.png')))
self.emoticons_description_textview.tv.display_html( self.emoticons_description_textview.tv.display_html(
desc, self.emoticons_description_textview) desc, self.emoticons_description_textview)
self.emoticons_description_textview.tv.set_property('sensitive', True) self.emoticons_description_textview.tv.set_property(
'sensitive', True)
else: else:
self.set_name.set_text('') self.set_name.set_text('')
self.authors_label.set_text('') self.authors_label.set_text('')