mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(gtk) turn on ellipsizing for torrent names in the debug window. add a little margin between the primary & secondary labels in the shutdown message.

This commit is contained in:
Charles Kerr 2008-03-13 20:47:58 +00:00
parent 9b3285c2ad
commit 3f32ee1627
2 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/main.c
View File

@ -44,6 +44,7 @@
#include "conf.h" #include "conf.h"
#include "details.h" #include "details.h"
#include "dialogs.h" #include "dialogs.h"
#include "hig.h"
#include "ipc.h" #include "ipc.h"
#include "makemeta-ui.h" #include "makemeta-ui.h"
#include "msgwin.h" #include "msgwin.h"
@ -590,7 +591,6 @@ do_exit_cb( GtkWidget *w UNUSED, gpointer data UNUSED )
static void static void
wannaquit( void * vdata ) wannaquit( void * vdata )
{ {
char * str;
GtkWidget * r, * p, * b, * w, *c; GtkWidget * r, * p, * b, * w, *c;
struct cbdata * cbdata = vdata; struct cbdata * cbdata = vdata;
@ -606,24 +606,28 @@ wannaquit( void * vdata )
r = gtk_alignment_new(0.5, 0.5, 0.01, 0.01); r = gtk_alignment_new(0.5, 0.5, 0.01, 0.01);
gtk_container_add(GTK_CONTAINER(c), r); gtk_container_add(GTK_CONTAINER(c), r);
p = gtk_table_new(2, 2, FALSE); p = gtk_table_new(3, 2, FALSE);
gtk_table_set_col_spacings( GTK_TABLE( p ), GUI_PAD_BIG );
gtk_container_add( GTK_CONTAINER( r ), p ); gtk_container_add( GTK_CONTAINER( r ), p );
w = gtk_image_new_from_stock( GTK_STOCK_NETWORK, GTK_ICON_SIZE_DIALOG ); w = gtk_image_new_from_stock( GTK_STOCK_NETWORK, GTK_ICON_SIZE_DIALOG );
gtk_table_attach(GTK_TABLE(p), w, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 2, 2); gtk_table_attach_defaults(GTK_TABLE(p), w, 0, 1, 0, 2 );
w = gtk_label_new(""); w = gtk_label_new( NULL );
str = g_strdup_printf( "<b>%s</b>\n%s", _("Closing Connections"), _("Sending upload/download totals to tracker...") ); gtk_label_set_markup( GTK_LABEL( w ), _( "<b>Closing Connections</b>" ) );
gtk_label_set_markup(GTK_LABEL(w), str ); gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_table_attach(GTK_TABLE(p), w, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 10, 0); gtk_table_attach_defaults( GTK_TABLE( p ), w, 1, 2, 0, 1 );
g_free( str );
w = gtk_label_new( _( "Sending upload/download totals to tracker..." ) );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_table_attach_defaults( GTK_TABLE( p ), w, 1, 2, 1, 2 );
b = gtk_alignment_new(0.0, 1.0, 0.01, 0.01); b = gtk_alignment_new(0.0, 1.0, 0.01, 0.01);
w = gtk_button_new_with_label( _( "_Quit Immediately" ) ); w = gtk_button_new_with_label( _( "_Quit Immediately" ) );
gtk_button_set_image( GTK_BUTTON(w), gtk_image_new_from_stock( GTK_STOCK_QUIT, GTK_ICON_SIZE_BUTTON ) ); gtk_button_set_image( GTK_BUTTON(w), gtk_image_new_from_stock( GTK_STOCK_QUIT, GTK_ICON_SIZE_BUTTON ) );
g_signal_connect(w, "clicked", G_CALLBACK(do_exit_cb), NULL); g_signal_connect(w, "clicked", G_CALLBACK(do_exit_cb), NULL);
gtk_container_add(GTK_CONTAINER(b), w); gtk_container_add(GTK_CONTAINER(b), w);
gtk_table_attach(GTK_TABLE(p), b, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 10, 0); gtk_table_attach(GTK_TABLE(p), b, 1, 2, 2, 3, GTK_FILL, GTK_FILL, 0, 10 );
gtk_widget_show_all(r); gtk_widget_show_all(r);

35
gtk/msgwin.c
View File

@ -227,6 +227,7 @@ renderText( GtkTreeViewColumn * column UNUSED,
gtk_tree_model_get( tree_model, iter, col, &str, COL_LEVEL, &level, -1 ); gtk_tree_model_get( tree_model, iter, col, &str, COL_LEVEL, &level, -1 );
g_object_set( renderer, "text", str, g_object_set( renderer, "text", str,
"foreground", getForegroundColor( level ), "foreground", getForegroundColor( level ),
"ellipsize", PANGO_ELLIPSIZE_END,
NULL ); NULL );
g_free( str ); g_free( str );
} }
@ -256,7 +257,6 @@ renderTime( GtkTreeViewColumn * column UNUSED,
static void static void
appendColumn( GtkTreeView * view, int col ) appendColumn( GtkTreeView * view, int col )
{ {
gboolean resizable;
GtkCellRenderer * r; GtkCellRenderer * r;
GtkTreeViewColumn * c; GtkTreeViewColumn * c;
int sort_col = col; int sort_col = col;
@ -275,34 +275,44 @@ appendColumn( GtkTreeView * view, int col )
switch( col ) switch( col )
{ {
case COL_LEVEL: case COL_LEVEL:
resizable = FALSE;
r = gtk_cell_renderer_pixbuf_new( ); r = gtk_cell_renderer_pixbuf_new( );
c = gtk_tree_view_column_new_with_attributes( title, r, NULL ); c = gtk_tree_view_column_new_with_attributes( title, r, NULL );
gtk_tree_view_column_set_sizing( c, GTK_TREE_VIEW_COLUMN_FIXED ); gtk_tree_view_column_set_sizing( c, GTK_TREE_VIEW_COLUMN_FIXED );
gtk_tree_view_column_set_fixed_width( c, 20 ); gtk_tree_view_column_set_fixed_width( c, 20 );
gtk_tree_view_column_set_cell_data_func( c, r, renderLevel, NULL, NULL ); gtk_tree_view_column_set_cell_data_func( c, r, renderLevel, NULL, NULL );
break; gtk_tree_view_column_set_resizable( c, FALSE );
case COL_FILE:
resizable = TRUE;
r = gtk_cell_renderer_text_new( );
c = gtk_tree_view_column_new_with_attributes( title, r, "text", col, NULL );
break; break;
case COL_LINE: case COL_LINE:
r = gtk_cell_renderer_text_new( );
c = gtk_tree_view_column_new_with_attributes( title, r, "text", col, NULL );
gtk_tree_view_column_set_resizable( c, FALSE );
break;
case COL_FILE:
case COL_CATEGORY: case COL_CATEGORY:
case COL_MESSAGE:
resizable = TRUE;
r = gtk_cell_renderer_text_new( ); r = gtk_cell_renderer_text_new( );
c = gtk_tree_view_column_new_with_attributes( title, r, NULL ); c = gtk_tree_view_column_new_with_attributes( title, r, NULL );
gtk_tree_view_column_set_cell_data_func( c, r, renderText, GINT_TO_POINTER(col), NULL ); gtk_tree_view_column_set_cell_data_func( c, r, renderText, GINT_TO_POINTER(col), NULL );
gtk_tree_view_column_set_sizing( c, GTK_TREE_VIEW_COLUMN_FIXED );
gtk_tree_view_column_set_fixed_width( c, 200 );
gtk_tree_view_column_set_resizable( c, TRUE );
break;
case COL_MESSAGE:
r = gtk_cell_renderer_text_new( );
c = gtk_tree_view_column_new_with_attributes( title, r, NULL );
gtk_tree_view_column_set_cell_data_func( c, r, renderText, GINT_TO_POINTER(col), NULL );
gtk_tree_view_column_set_sizing( c, GTK_TREE_VIEW_COLUMN_FIXED );
gtk_tree_view_column_set_fixed_width( c, 500 );
gtk_tree_view_column_set_resizable( c, TRUE );
break; break;
case COL_TIME: case COL_TIME:
resizable = TRUE;
r = gtk_cell_renderer_text_new( ); r = gtk_cell_renderer_text_new( );
c = gtk_tree_view_column_new_with_attributes( title, r, NULL ); c = gtk_tree_view_column_new_with_attributes( title, r, NULL );
gtk_tree_view_column_set_cell_data_func( c, r, renderTime, NULL, NULL ); gtk_tree_view_column_set_cell_data_func( c, r, renderTime, NULL, NULL );
gtk_tree_view_column_set_resizable( c, TRUE );
sort_col = COL_SEQUENCE; sort_col = COL_SEQUENCE;
break; break;
@ -311,7 +321,6 @@ appendColumn( GtkTreeView * view, int col )
break; break;
} }
gtk_tree_view_column_set_resizable( c, resizable );
gtk_tree_view_column_set_sort_column_id( c, sort_col ); gtk_tree_view_column_set_sort_column_id( c, sort_col );
gtk_tree_view_append_column( view, c ); gtk_tree_view_append_column( view, c );
} }
@ -429,7 +438,7 @@ msgwin_create( TrCore * core )
appendColumn( data->view, COL_MESSAGE ); appendColumn( data->view, COL_MESSAGE );
w = gtk_scrolled_window_new( NULL, NULL ); w = gtk_scrolled_window_new( NULL, NULL );
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( w ), gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( w ),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC ); GTK_POLICY_AUTOMATIC );
gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( w ), gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( w ),
GTK_SHADOW_IN); GTK_SHADOW_IN);