From 99f95b6910f1d48d26e5836b03c29b57204c32ca Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 25 Mar 2009 12:09:15 +0000 Subject: (run_treeview_dialog) do not use Gtk2::Sexy anymore (sligthly reduce memory usage) (needs drakxtools > 12.17.1) --- NEWS | 1 + rpmdrake | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index a57d1cfa..944d65d2 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ - rpmdrake: + o do not use Gtk2::Sexy anymore (sligthly reduce memory usage) o update GUI package list (#49086) Version 5.12 - 19 March 2009, Thierry Vignaud diff --git a/rpmdrake b/rpmdrake index 430f76db..a67c162c 100755 --- a/rpmdrake +++ b/rpmdrake @@ -45,7 +45,6 @@ use ugtk2 qw(:all); use Gtk2::Gdk::Keysyms; use Rpmdrake::widgets; use feature 'state'; -use Gtk2::Sexy; $ugtk2::wm_icon = get_icon('installremoverpm', "title-$MODE"); @@ -642,14 +641,17 @@ sub run_treeview_dialog { 0, $view_box, 0, $filter_box, 0, gtknew('Label', text => N("Find:")), - 1, $find_entry = gtknew('Sexy_IconEntry', clear_button => 1, width => 260, - primary_icon => Gtk2::Image->new_from_stock('gtk-find', 'menu'), + 1, $find_entry = gtknew('Entry', width => 260, + primary_icon => 'gtk-find', + secondary_icon => 'gtk-clear', tip => N("Find"), - 'icon-released' => $find_callback, - 'icon-pressed' => sub { - my (undef, $pos, $button) = @_; - return if $pos != 0; - $search_menu->popup(undef, undef, undef, undef, $button, undef); + 'icon-release' => $find_callback, + 'icon-press' => sub { + my (undef, $pos, $event) = @_; + # emulate Sexy::IconEntry's clear_button: + $find_entry->set_text('') if $pos eq 'secondary'; + return if $pos ne 'primary'; + $search_menu->popup(undef, undef, undef, undef, $event->button, $event->time); }, key_press_event => sub { member($_[1]->keyval, $Gtk2::Gdk::Keysyms{Return}, $Gtk2::Gdk::Keysyms{KP_Enter}) -- cgit v1.2.1