Changeset 6998
- Timestamp:
- Oct 31, 2008, 6:25:21 PM (12 years ago)
- Location:
- trunk/gtk
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gtk/Makefile.am
r6929 r6998 2 2 3 3 if TR_UNSTABLE 4 GTK_EXTRA_CPPFLAGS= "-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED"4 GTK_EXTRA_CPPFLAGS=-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES 5 5 endif 6 6 -
trunk/gtk/add-dialog.c
r6978 r6998 385 385 0, 0 ); 386 386 387 gtk_box_pack_start _defaults( GTK_BOX( GTK_DIALOG( d )->vbox ), t);387 gtk_box_pack_start( GTK_BOX( GTK_DIALOG( d )->vbox ), t, TRUE, TRUE, 0 ); 388 388 gtk_widget_show_all( d ); 389 389 return d; -
trunk/gtk/add-dialog.h
r6795 r6998 14 14 #define TR_GTK_ADD_DIALOG_H 15 15 16 #include <gtk/gtk window.h>16 #include <gtk/gtk.h> 17 17 #include "tr-core.h" 18 18 -
trunk/gtk/details.c
r6807 r6998 869 869 /* h = gtk_hbox_new (FALSE, GUI_PAD); */ 870 870 /* gtk_box_pack_start_defaults (GTK_BOX(h), sw); */ 871 gtk_box_pack_start _defaults( GTK_BOX( vbox ), sw);871 gtk_box_pack_start( GTK_BOX( vbox ), sw, TRUE, TRUE, 0 ); 872 872 873 873 hbox = gtk_hbox_new ( FALSE, GUI_PAD ); … … 877 877 l = p->seeders_lb = gtk_label_new ( NULL ); 878 878 gtk_box_pack_start ( GTK_BOX( hbox ), l, FALSE, FALSE, 0 ); 879 gtk_box_pack_start_defaults ( GTK_BOX( hbox ), 880 gtk_alignment_new ( 0.0f, 0.0f, 0.0f, 0.0f ) ); 879 gtk_box_pack_start( GTK_BOX( hbox ), 880 gtk_alignment_new ( 0.0f, 0.0f, 0.0f, 0.0f ), 881 TRUE, TRUE, 0 ); 881 882 l = gtk_label_new ( NULL ); 882 883 gtk_label_set_markup ( GTK_LABEL( l ), _( "<b>Leechers:</b>" ) ); … … 884 885 l = p->leechers_lb = gtk_label_new ( NULL ); 885 886 gtk_box_pack_start ( GTK_BOX( hbox ), l, FALSE, FALSE, 0 ); 886 gtk_box_pack_start_defaults ( GTK_BOX( hbox ), 887 gtk_alignment_new ( 0.0f, 0.0f, 0.0f, 0.0f ) ); 887 gtk_box_pack_start( GTK_BOX( hbox ), 888 gtk_alignment_new ( 0.0f, 0.0f, 0.0f, 0.0f ), 889 TRUE, TRUE, 0 ); 888 890 l = gtk_label_new ( NULL ); 889 891 gtk_label_set_markup ( GTK_LABEL( l ), _( "<b>Times Completed:</b>" ) ); … … 1561 1563 gtk_label_new ( _( "Options" ) ) ); 1562 1564 1563 gtk_box_pack_start _defaults ( GTK_BOX( GTK_DIALOG( d )->vbox ), n);1565 gtk_box_pack_start( GTK_BOX( GTK_DIALOG( d )->vbox ), n, TRUE, TRUE, 0 ); 1564 1566 1565 1567 tag = g_timeout_add ( UPDATE_INTERVAL_MSEC, periodic_refresh, d ); -
trunk/gtk/details.h
r6795 r6998 14 14 #define GTK_TORRENT_INSPECTOR_H 15 15 16 #include <gtk/gtk window.h>16 #include <gtk/gtk.h> 17 17 #include "tr-torrent.h" 18 18 -
trunk/gtk/file-list.h
r6795 r6998 26 26 #define GTK_TORRENT_FILE_LIST_H 27 27 28 #include <gtk/gtk widget.h>28 #include <gtk/gtk.h> 29 29 #include "tr-torrent.h" 30 30 -
trunk/gtk/hig.h
r6795 r6998 14 14 #define __HIG_H__ 15 15 16 #include <gtk/gtk widget.h>16 #include <gtk/gtk.h> 17 17 18 18 /** -
trunk/gtk/makemeta-ui.c
r6978 r6998 409 409 w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f ); 410 410 gtk_widget_set_size_request ( w, 2 * GUI_PAD_BIG, 0 ); 411 gtk_box_pack_start _defaults ( GTK_BOX( h2 ), w);411 gtk_box_pack_start( GTK_BOX( h2 ), w, TRUE, TRUE, 0 ); 412 412 gtk_box_pack_start( GTK_BOX( v ), h2, FALSE, FALSE, 0 ); 413 gtk_box_pack_start _defaults( GTK_BOX( h ), v);413 gtk_box_pack_start( GTK_BOX( h ), v, TRUE, TRUE, 0 ); 414 414 v = gtk_vbox_new( FALSE, GUI_PAD_SMALL ); 415 415 w = gtr_button_new_from_stock( GTK_STOCK_DIRECTORY, _( "F_older" ) ); … … 417 417 g_signal_connect( w, "clicked", G_CALLBACK( 418 418 onChooseDirectoryClicked ), ui ); 419 gtk_box_pack_start _defaults( GTK_BOX( v ), w);419 gtk_box_pack_start( GTK_BOX( v ), w, TRUE, TRUE, 0 ); 420 420 w = gtr_button_new_from_stock( GTK_STOCK_FILE, _( "_File" ) ); 421 421 g_signal_connect( w, "clicked", G_CALLBACK( onChooseFileClicked ), ui ); 422 gtk_box_pack_start _defaults( GTK_BOX( v ), w);422 gtk_box_pack_start( GTK_BOX( v ), w, TRUE, TRUE, 0 ); 423 423 gtk_box_pack_start( GTK_BOX( h ), v, FALSE, FALSE, 0 ); 424 424 hig_workarea_add_wide_control( t, &row, h ); … … 480 480 481 481 hig_workarea_finish( t, &row ); 482 gtk_box_pack_start _defaults( main_vbox, t);482 gtk_box_pack_start( main_vbox, t, TRUE, TRUE, 0 ); 483 483 484 484 w = gtk_frame_new( NULL ); -
trunk/gtk/sexy-icon-entry.c
r6872 r6998 151 151 G_STRUCT_OFFSET(SexyIconEntryClass, icon_released), 152 152 NULL, NULL, 153 gtk_marshal_VOID__INT_INT,153 sexy_marshal_VOID__INT_INT, 154 154 G_TYPE_NONE, 2, 155 155 G_TYPE_INT, -
trunk/gtk/sexy-icon-entry.h
r6795 r6998 26 26 typedef struct _SexyIconEntryPriv SexyIconEntryPriv; 27 27 28 #include <gtk/gtkentry.h> 29 #include <gtk/gtkimage.h> 28 #include <gtk/gtk.h> 30 29 31 30 #define SEXY_TYPE_ICON_ENTRY ( sexy_icon_entry_get_type( ) ) -
trunk/gtk/stats.c
r6978 r6998 140 140 -1 ); 141 141 t = hig_workarea_create( ); 142 gtk_box_pack_start _defaults( GTK_BOX( GTK_DIALOG( d )->vbox ), t);142 gtk_box_pack_start( GTK_BOX( GTK_DIALOG( d )->vbox ), t, TRUE, TRUE, 0 ); 143 143 ui->core = core; 144 144 -
trunk/gtk/stats.h
r6795 r6998 14 14 #define __TR_GTK_STATS_H__ 15 15 16 #include <gtk/gtkwidget.h> 17 #include <gtk/gtkwindow.h> 16 #include <gtk/gtk.h> 18 17 #include "tr-core.h" 19 18 -
trunk/gtk/torrent-cell-renderer.c
r6935 r6998 13 13 #include "assert.h" 14 14 #include <gtk/gtk.h> 15 #include <gtk/gtkcellrenderertext.h>16 #include <gtk/gtkcellrendererprogress.h>17 15 #include <glib/gi18n.h> 18 16 #include <libtransmission/transmission.h> -
trunk/gtk/torrent-cell-renderer.h
r6795 r6998 15 15 16 16 #include <glib-object.h> 17 #include <gtk/gtk cellrenderer.h>17 #include <gtk/gtk.h> 18 18 19 19 #define TORRENT_CELL_RENDERER_TYPE ( torrent_cell_renderer_get_type( ) ) -
trunk/gtk/tr-prefs.c
r6978 r6998 534 534 updateBlocklistText( w, TR_CORE( core ) ); 535 535 h = gtk_hbox_new( FALSE, GUI_PAD_BIG ); 536 gtk_box_pack_start _defaults( GTK_BOX( h ), w);536 gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 ); 537 537 b = gtr_button_new_from_stock( GTK_STOCK_REFRESH, _( "_Update" ) ); 538 538 data->check = w; … … 789 789 g_signal_connect( w, "clicked", G_CALLBACK( onRPCToggled ), page ); 790 790 h = gtk_hbox_new( FALSE, GUI_PAD_BIG ); 791 gtk_box_pack_start _defaults( GTK_BOX( h ), w);791 gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 ); 792 792 w = gtk_button_new_from_stock( GTK_STOCK_OPEN ); 793 793 page->widgets = g_slist_append( page->widgets, w ); … … 843 843 GtkWidget * w; 844 844 GtkWidget * h; 845 GtkTooltips * tips = gtk_tooltips_new( );846 845 847 846 page->store = GTK_LIST_STORE( m ); … … 852 851 page->whitelist_widgets = g_slist_append( page->whitelist_widgets, w ); 853 852 v = page->view = GTK_TREE_VIEW( w ); 854 gtk_tooltips_set_tip( tips, w, 855 _( "IP addresses may use wildcards, such as 192.168.*.*" ), NULL ); 853 #if GTK_CHECK_VERSION( 2,12,0 ) 854 gtk_widget_set_tooltip_text( w, 855 _( "IP addresses may use wildcards, such as 192.168.*.*" ) ); 856 #endif 856 857 sel = gtk_tree_view_get_selection( v ); 857 858 g_signal_connect( sel, "changed", … … 887 888 page->remove_button = w; 888 889 onWhitelistSelectionChanged( sel, page ); 889 gtk_box_pack_start _defaults( GTK_BOX( h ), w);890 gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 ); 890 891 w = gtk_button_new_from_stock( GTK_STOCK_ADD ); 891 892 page->whitelist_widgets = g_slist_append( page->whitelist_widgets, w ); 892 893 g_signal_connect( w, "clicked", G_CALLBACK( onAddWhitelistClicked ), page ); 893 gtk_box_pack_start _defaults( GTK_BOX( h ), w);894 gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 ); 894 895 w = gtk_hbox_new( FALSE, 0 ); 895 gtk_box_pack_start _defaults( GTK_BOX( w),896 gtk_alignment_new( 0, 0, 0, 0 ));896 gtk_box_pack_start( GTK_BOX( w ), gtk_alignment_new( 0, 0, 0, 0 ), 897 TRUE, TRUE, 0 ); 897 898 gtk_box_pack_start( GTK_BOX( w ), h, FALSE, FALSE, 0 ); 898 899 hig_workarea_add_wide_control( t, &row, w ); … … 1412 1413 1413 1414 g_signal_connect( d, "response", G_CALLBACK( response_cb ), core ); 1414 gtk_box_pack_start _defaults( GTK_BOX( GTK_DIALOG( d )->vbox ), n);1415 gtk_box_pack_start( GTK_BOX( GTK_DIALOG( d )->vbox ), n, TRUE, TRUE, 0 ); 1415 1416 gtk_widget_show_all( GTK_DIALOG( d )->vbox ); 1416 1417 return d; -
trunk/gtk/tr-window.c
r6978 r6998 674 674 w ), GTK_SHADOW_IN ); 675 675 gtk_container_add( GTK_CONTAINER( w ), p->view ); 676 gtk_box_pack_start _defaults( GTK_BOX( vbox ), w);676 gtk_box_pack_start( GTK_BOX( vbox ), w, TRUE, TRUE, 0 ); 677 677 gtk_container_set_focus_child( GTK_CONTAINER( vbox ), w ); 678 678 -
trunk/gtk/tracker-list.c
r6862 r6998 362 362 w = gtk_button_new_from_stock( GTK_STOCK_ADD ); 363 363 g_signal_connect( w, "clicked", G_CALLBACK( onTrackerAddClicked ), page ); 364 gtk_box_pack_start _defaults( GTK_BOX( buttons ), w);364 gtk_box_pack_start( GTK_BOX( buttons ), w, TRUE, TRUE, 0 ); 365 365 page->add_button = w; 366 366 w = gtk_button_new_from_stock( GTK_STOCK_REMOVE ); 367 367 g_signal_connect( w, "clicked", G_CALLBACK( 368 368 onTrackerRemoveClicked ), page ); 369 gtk_box_pack_start _defaults( GTK_BOX( buttons ), w);369 gtk_box_pack_start( GTK_BOX( buttons ), w, TRUE, TRUE, 0 ); 370 370 page->remove_button = w; 371 371 if( gtor ) … … 375 375 onTrackerSaveClicked ), page ); 376 376 gtk_widget_set_sensitive( w, FALSE ); 377 gtk_box_pack_start _defaults( GTK_BOX( buttons ), w);377 gtk_box_pack_start( GTK_BOX( buttons ), w, TRUE, TRUE, 0 ); 378 378 page->save_button = w; 379 379 … … 382 382 onTrackerRevertClicked ), page ); 383 383 gtk_widget_set_sensitive( w, FALSE ); 384 gtk_box_pack_start _defaults( GTK_BOX( buttons ), w);384 gtk_box_pack_start( GTK_BOX( buttons ), w, TRUE, TRUE, 0 ); 385 385 page->revert_button = w; 386 386 } 387 387 388 388 gtk_box_pack_start( GTK_BOX( box ), buttons, FALSE, FALSE, 0 ); 389 gtk_box_pack_start _defaults( GTK_BOX( top ), fr);389 gtk_box_pack_start( GTK_BOX( top ), fr, TRUE, TRUE, 0 ); 390 390 gtk_box_pack_start( GTK_BOX( top ), box, FALSE, FALSE, 0 ); 391 391 -
trunk/gtk/tracker-list.h
r6831 r6998 2 2 #define TRACKER_LIST_H 3 3 4 #include <gtk/gtk widget.h>4 #include <gtk/gtk.h> 5 5 #include "tr-torrent.h" 6 6
Note: See TracChangeset
for help on using the changeset viewer.