mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-03 05:25:52 +00:00
Code Issues Releases Wiki Activity

(trunk gtk) #2233: Replace SexyIconEntry by GtkEntry icon functionality if GTK+ >= 2.16.0

Browse source
This commit is contained in:
Charles Kerr 2009-06-21 17:18:02 +00:00
parent 39330501e4
commit 4d46cc5f7a
2 changed files with 62 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gtk/sexy-icon-entry.c
View file

@ -18,9 +18,10 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#if !GTK_CHECK_VERSION( 2,16,0 ) /* these features were added to GtkEntry in 2.16 */
#include <string.h>
#include "sexy-icon-entry.h" #include "sexy-icon-entry.h"
#include "sexy-marshal.h" #include "sexy-marshal.h"
@ -974,3 +975,5 @@ sexy_icon_entry_add_clear_button(SexyIconEntry *icon_entry)
g_signal_connect(G_OBJECT(icon_entry), "icon_released", g_signal_connect(G_OBJECT(icon_entry), "icon_released",
G_CALLBACK(clear_button_clicked_cb), NULL); G_CALLBACK(clear_button_clicked_cb), NULL);
} }
#endif /* #if !GTK_CHECK_VERSION( 2,16,0 ) */

80
gtk/tr-window.c
View file

@ -27,12 +27,18 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#if !GTK_CHECK_VERSION( 2,16,0 )
/* FIXME: when 2.16 has been out long enough, it would be really nice to
* get rid of this libsexy usage because of its makefile strangeness */
#define USE_SEXY
#include "sexy-icon-entry.h"
#endif
#include <libtransmission/transmission.h> #include <libtransmission/transmission.h>
#include "actions.h" #include "actions.h"
#include "conf.h" #include "conf.h"
#include "hig.h" #include "hig.h"
#include "sexy-icon-entry.h"
#include "torrent-cell-renderer.h" #include "torrent-cell-renderer.h"
#include "tr-prefs.h" #include "tr-prefs.h"
#include "tr-torrent.h" #include "tr-torrent.h"
@ -500,17 +506,33 @@ filter_entry_changed( GtkEditable * e,
g_free( pch ); g_free( pch );
} }
#ifdef USE_SEXY
static void static void
entry_icon_released( SexyIconEntry * entry UNUSED, entry_icon_released( SexyIconEntry * entry UNUSED,
SexyIconEntryPosition icon_pos, SexyIconEntryPosition icon_pos,
int button UNUSED, int button UNUSED,
gpointer menu ) gpointer menu )
{ {
if( icon_pos == SEXY_ICON_ENTRY_PRIMARY ) if( icon_pos == SEXY_ICON_ENTRY_PRIMARY )
gtk_menu_popup ( GTK_MENU( gtk_menu_popup( GTK_MENU( menu ), NULL, NULL, NULL, NULL, 0,
menu ), NULL, NULL, NULL, NULL, 0,
gtk_get_current_event_time( ) ); gtk_get_current_event_time( ) );
} }
#else
static void
entry_icon_release( GtkEntry * entry UNUSED,
GtkEntryIconPosition icon_pos,
GdkEventButton * event UNUSED,
gpointer menu )
{
if( icon_pos == GTK_ENTRY_ICON_SECONDARY )
gtk_entry_set_text( entry, "" );
if( icon_pos == GTK_ENTRY_ICON_PRIMARY )
gtk_menu_popup( GTK_MENU( menu ), NULL, NULL, NULL, NULL, 0,
gtk_get_current_event_time( ) );
}
#endif
#if GTK_CHECK_VERSION( 2, 12, 0 ) #if GTK_CHECK_VERSION( 2, 12, 0 )
@ -794,12 +816,12 @@ GtkWidget *
tr_window_new( GtkUIManager * ui_mgr, TrCore * core ) tr_window_new( GtkUIManager * ui_mgr, TrCore * core )
{ {
int i, n; int i, n;
const char * pch; const char * pch;
PrivateData * p; PrivateData * p;
GtkWidget *mainmenu, *toolbar, *filter, *list, *status; GtkWidget * mainmenu, *toolbar, *filter, *list, *status;
GtkWidget * vbox, *w, *self, *h, *s, *hbox, *image, *menu; GtkWidget * vbox, *w, *self, *h, *s, *hbox, *menu;
GtkWindow * win; GtkWindow * win;
GSList * l; GSList * l;
const char * filter_names[FILTER_MODE_QTY] = { const char * filter_names[FILTER_MODE_QTY] = {
/* show all torrents */ /* show all torrents */
@ -867,15 +889,24 @@ tr_window_new( GtkUIManager * ui_mgr, TrCore * core )
gtk_box_pack_start( GTK_BOX( h ), w, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( h ), w, FALSE, FALSE, 0 );
} }
#ifdef USE_SEXY
s = sexy_icon_entry_new( ); s = sexy_icon_entry_new( );
sexy_icon_entry_add_clear_button( SEXY_ICON_ENTRY( s ) ); sexy_icon_entry_add_clear_button( SEXY_ICON_ENTRY( s ) );
image = gtk_image_new_from_stock( GTK_STOCK_FIND, GTK_ICON_SIZE_MENU ); w = gtk_image_new_from_stock( GTK_STOCK_FIND, GTK_ICON_SIZE_MENU );
sexy_icon_entry_set_icon( SEXY_ICON_ENTRY( sexy_icon_entry_set_icon( SEXY_ICON_ENTRY( s ),
s ), SEXY_ICON_ENTRY_PRIMARY, SEXY_ICON_ENTRY_PRIMARY,
GTK_IMAGE( image ) ); GTK_IMAGE( w ) );
sexy_icon_entry_set_icon_highlight( SEXY_ICON_ENTRY( sexy_icon_entry_set_icon_highlight( SEXY_ICON_ENTRY( s ),
s ), SEXY_ICON_ENTRY_PRIMARY, SEXY_ICON_ENTRY_PRIMARY, TRUE );
TRUE ); #else
s = gtk_entry_new( );
gtk_entry_set_icon_from_stock( GTK_ENTRY( s ),
GTK_ENTRY_ICON_PRIMARY,
GTK_STOCK_FIND);
gtk_entry_set_icon_from_stock( GTK_ENTRY( s ),
GTK_ENTRY_ICON_SECONDARY,
GTK_STOCK_CLEAR );
#endif
gtk_box_pack_end( GTK_BOX( h ), s, FALSE, FALSE, 0 ); gtk_box_pack_end( GTK_BOX( h ), s, FALSE, FALSE, 0 );
g_signal_connect( s, "changed", G_CALLBACK( filter_entry_changed ), p ); g_signal_connect( s, "changed", G_CALLBACK( filter_entry_changed ), p );
@ -958,7 +989,7 @@ tr_window_new( GtkUIManager * ui_mgr, TrCore * core )
menu = gtk_menu_new( ); menu = gtk_menu_new( );
l = NULL; l = NULL;
for( i = 0; i < FILTER_TEXT_MODE_QTY; ++i ) for( i=0; i<FILTER_TEXT_MODE_QTY; ++i )
{ {
const char * name = _( filter_text_names[i] ); const char * name = _( filter_text_names[i] );
GtkWidget * w = gtk_radio_menu_item_new_with_label ( l, name ); GtkWidget * w = gtk_radio_menu_item_new_with_label ( l, name );
@ -970,8 +1001,13 @@ tr_window_new( GtkUIManager * ui_mgr, TrCore * core )
gtk_menu_shell_append( GTK_MENU_SHELL( menu ), w ); gtk_menu_shell_append( GTK_MENU_SHELL( menu ), w );
gtk_widget_show( w ); gtk_widget_show( w );
} }
g_signal_connect( s, "icon-released",
G_CALLBACK( entry_icon_released ), menu ); #ifdef USE_SEXY
g_signal_connect( s, "icon-released", G_CALLBACK( entry_icon_released ), menu );
#else
g_signal_connect( s, "icon-release", G_CALLBACK( entry_icon_release ), menu );
#endif
/* workarea */ /* workarea */
p->view = makeview( p, core ); p->view = makeview( p, core );