--- a/src/gui/data/packagemanager.glade Thu Jul 16 19:21:13 2009 -0700
+++ b/src/gui/data/packagemanager.glade Fri Jul 17 15:30:26 2009 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<glade-interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gtk+ 2.16 -->
<!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="mainwindow">
<property name="width_request">750</property>
@@ -50,6 +50,20 @@
</widget>
</child>
<child>
+ <widget class="GtkSeparatorMenuItem" id="separatormenuitem4">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="file_reload">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Reload all package information</property>
+ <property name="label" translatable="yes">_Reload</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_reload_button_clicked" after="yes"/>
+ </widget>
+ </child>
+ <child>
<widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
<property name="visible">True</property>
</widget>
@@ -330,21 +344,6 @@
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <widget class="GtkToolButton" id="reloadbutton">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip" translatable="yes">Click to get list of newest packages.</property>
- <property name="is_important">True</property>
- <property name="label" translatable="yes">Reload</property>
- <property name="icon">reload24x.png</property>
- <signal name="clicked" handler="on_reload_button_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
<widget class="GtkToolButton" id="update_all_button">
<property name="visible">True</property>
<property name="sensitive">False</property>
@@ -440,16 +439,44 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="set_search">
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="searchentry">
+ <property name="width_request">177</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip" translatable="yes">Type text to search name and description of the package.</property>
+ <property name="secondary_icon_stock">gtk-cancel</property>
+ <property name="secondary_icon_activatable">True</property>
+ <property name="secondary_icon_sensitive">True</property>
+ <property name="secondary_icon_tooltip_text">Clear search text and results</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible-name">Search</atkproperty>
+ </accessibility>
+ <signal name="changed" handler="on_searchentry_changed"/>
+ <signal name="focus_out_event" handler="on_searchentry_focus_out_event"/>
+ <signal name="icon_press" handler="on_clear_search_clicked"/>
+ <signal name="activate" handler="on_searchentry_activate"/>
+ <signal name="focus_in_event" handler="on_searchentry_focus_in_event"/>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="do_search">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">Search</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <signal name="button_press_event" handler="on_set_search_button_press_event"/>
- <signal name="clicked" handler="on_set_search_clicked"/>
+ <signal name="button_press_event" handler="on_do_search_button_press_event"/>
+ <signal name="clicked" handler="on_do_search_clicked"/>
<child>
<widget class="GtkHBox" id="hbox23">
<property name="visible">True</property>
@@ -463,60 +490,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkImage" id="search_image_arrow">
- <property name="visible">True</property>
- <property name="pixbuf">arrow.png</property>
- <property name="icon-size">1</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="searchentry">
- <property name="width_request">177</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip" translatable="yes">Type text to search name and description of the package.</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible-name">Search</atkproperty>
- </accessibility>
- <signal name="changed" handler="on_searchentry_changed"/>
- <signal name="focus_out_event" handler="on_searchentry_focus_out_event"/>
- <signal name="focus_in_event" handler="on_searchentry_focus_in_event"/>
- <signal name="activate" handler="on_searchentry_activate"/>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="clear_search">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <property name="focus_on_click">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <signal name="clicked" handler="on_clear_search_clicked"/>
- <child>
- <widget class="GtkImage" id="clear_image">
- <property name="visible">True</property>
- <property name="stock">gtk-missing-image</property>
</widget>
</child>
</widget>
@@ -678,7 +651,7 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="yalign">0.60000002384185791</property>
- <property name="label" translatable="yes"><i>_Repository:</i></property>
+ <property name="label" translatable="yes">Package _Source:</property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="justify">right</property>