changeset 3aa9ee04f201 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=3aa9ee04f201 description: merge
diffstat:
data/gui/plugins_window.ui | 398 ++++++---------------------------- plugins/ftp_manager/config_dialog.ui | 2 +- 2 files changed, 77 insertions(+), 323 deletions(-)
diffs (truncated from 491 to 300 lines):
diff -r b20793bde31b -r 3aa9ee04f201 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Thu Aug 25 00:03:03 2011 +0200 +++ b/data/gui/plugins_window.ui Thu Aug 25 13:02:50 2011 +0300 @@ -25,24 +25,82 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="position">250</property> - <property name="position_set">True</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="border_width">6</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> + <property name="xalign">0</property> <child> - <object class="GtkTreeView" id="installed_plugins_treeview"> + <object class="GtkVBox" id="vbox6"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">6</property> + <property name="hscrollbar_policy">never</property> + <child> + <object class="GtkTreeView" id="installed_plugins_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAspectFrame" id="aspectframe1"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <property name="xalign">0</property> + <child> + <object class="GtkButton" id="install_plugin_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="on_install_plugin_button_clicked"/> + <child> + <object class="GtkHBox" id="hbox8"> + <property name="visible">True</property> + <child> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-apply</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="configure_plugin_button_label2"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Install from zip</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> </object> </child> </object> <packing> <property name="resize">False</property> - <property name="shrink">True</property> + <property name="shrink">False</property> </packing> </child> <child> @@ -166,7 +224,6 @@ <child> <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkHBox" id="hbox5"> <property name="visible">True</property> @@ -181,15 +238,7 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> + <placeholder/> </child> </object> <packing> @@ -220,58 +269,21 @@ </packing> </child> <child> - <object class="GtkHButtonBox" id="hbuttonbox2"> + <object class="GtkHButtonBox" id="hbuttonbox3"> <property name="visible">True</property> <property name="spacing">5</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="install_plugin_button"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="on_install_plugin_button_clicked"/> - <child> - <object class="GtkHBox" id="hbox13"> - <property name="visible">True</property> - <child> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="stock">gtk-apply</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="install_plugin_button_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Install</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkButton" id="uninstall_plugin_button"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="receives_default">True</property> <signal name="clicked" handler="on_uninstall_plugin_button_clicked"/> <child> - <object class="GtkHBox" id="hbox11"> + <object class="GtkHBox" id="hbox6"> <property name="visible">True</property> <child> - <object class="GtkImage" id="image1"> + <object class="GtkImage" id="image5"> <property name="visible">True</property> <property name="stock">gtk-cancel</property> </object> @@ -280,7 +292,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="uninstall_plugin_button_label"> + <object class="GtkLabel" id="uninstall_plugin_button_label1"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Uninstall</property> @@ -305,10 +317,10 @@ <property name="receives_default">True</property> <signal name="clicked" handler="on_configure_plugin_button_clicked"/> <child> - <object class="GtkHBox" id="hbox12"> + <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> <child> - <object class="GtkImage" id="image2"> + <object class="GtkImage" id="image6"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> </object> @@ -317,7 +329,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="configure_plugin_button_label"> + <object class="GtkLabel" id="configure_plugin_button_label1"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Configure</property> @@ -359,264 +371,6 @@ </packing> </child> <child> - <object class="GtkHPaned" id="hpaned2"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTreeView" id="treeview2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - </child> - </object> - <packing> - <property name="resize">False</property> - <property name="shrink">True</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox4"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkHBox" id="hbox6"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="plugin_name_label1"> - <property name="visible">True</property> - <property name="label" translatable="yes"><empty></property> - <property name="selectable">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment3"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox7"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="label" translatable="yes">Version:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="plugin_version_label1"> - <property name="visible">True</property> - <property name="label" translatable="yes"><empty></property> - <property name="selectable">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - </object>