Diff of /trunk/src/cache.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 178 by harbaum, Thu Nov 12 19:58:26 2009 UTC revision 184 by harbaum, Sat Nov 14 12:28:54 2009 UTC
# Line 179  static GtkWidget *cache_overview(cache_c Line 179  static GtkWidget *cache_overview(cache_c
179    
180    if(cache->type != CACHE_TYPE_UNKNOWN) {    if(cache->type != CACHE_TYPE_UNKNOWN) {
181      gtk_table_attach(GTK_TABLE(table),      gtk_table_attach(GTK_TABLE(table),
182    
183  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
184               tip = icon_get_widget(ICON_CACHE_TYPE_2X, cache->type),               tip = icon_get_widget(ICON_CACHE_TYPE_2X, cache->type),
185  #else  #else
186               tip = icon_get_widget(ICON_CACHE_TYPE_1_5X, cache->type),               tip = icon_get_widget(ICON_CACHE_TYPE_1_5X, cache->type),
187  #endif  #endif
188                       0,1,0,1, GTK_FILL, 0, GTK_FILL, 0);                       0,1,0,1, GTK_FILL, 0, GTK_FILL, 0);
189    
190  #ifndef USE_MAEMO  #ifndef USE_MAEMO
191      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);
192  #endif  #endif
# Line 282  static GtkWidget *cache_overview(cache_c Line 284  static GtkWidget *cache_overview(cache_c
284      /* fill with vote if present on disk (will also free vote) */      /* fill with vote if present on disk (will also free vote) */
285      if(vote)      if(vote)
286        gcvote_set(context, vote);        gcvote_set(context, vote);
   
     gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);  
287    }    }
288    
289      gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);
290    
291    /* ----------------------------------------------------- */    /* ----------------------------------------------------- */
292    
293    
# Line 514  static GtkWidget *cache_tbs(appdata_t *a Line 516  static GtkWidget *cache_tbs(appdata_t *a
516    
517      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
518      GtkWidget *icon = NULL;      GtkWidget *icon = NULL;
519      if(strcasestr(tb->name, "coin") != 0)      if((strcasestr(tb->name, "coin") != 0) ||
520           (strcasestr(tb->name, "muenze") != 0) ||
521           (strcasestr(tb->name, "münze") != 0))
522        icon = icon_get_widget(ICON_TB, 1);   /* coin icon */        icon = icon_get_widget(ICON_TB, 1);   /* coin icon */
523      else      else
524        icon = icon_get_widget(ICON_TB, 0);   /* tb icon */        icon = icon_get_widget(ICON_TB, 0);   /* tb icon */
# Line 592  static GtkWidget *cache_logs(appdata_t * Line 596  static GtkWidget *cache_logs(appdata_t *
596      gtk_signal_connect(GTK_OBJECT(but), "clicked",      gtk_signal_connect(GTK_OBJECT(but), "clicked",
597                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);
598    
599      gtk_box_pack_start_defaults(GTK_BOX(vbox), but);      gtk_box_pack_start(GTK_BOX(vbox), but, FALSE, FALSE, 0);
600    }    }
601  #endif  #endif
602    
# Line 641  static GtkWidget *cache_logs(appdata_t * Line 645  static GtkWidget *cache_logs(appdata_t *
645    
646      gtk_box_pack_start(GTK_BOX(ivbox), ihbox, FALSE, FALSE, 0);      gtk_box_pack_start(GTK_BOX(ivbox), ihbox, FALSE, FALSE, 0);
647    
648      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0, 1,      gtk_table_attach(GTK_TABLE(table), ivbox, 0, 1,
649                                2*log_cnt, 2*log_cnt+1);                       2*log_cnt, 2*log_cnt+1, 0, GTK_EXPAND | GTK_FILL, 0, 0);
650    
651      if(log->text) {      if(log->text) {
652        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
653          html_view(appdata, log->text,          html_view(appdata, log->text,
# Line 664  static GtkWidget *cache_logs(appdata_t * Line 668  static GtkWidget *cache_logs(appdata_t *
668      log_cnt++;      log_cnt++;
669    }    }
670    
671    gtk_box_pack_start_defaults(GTK_BOX(vbox), table);    gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
672    
673  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
674    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
# Line 785  static GtkWidget *notebook_new(void) { Line 789  static GtkWidget *notebook_new(void) {
789  #endif  #endif
790  }  }
791    
792    #ifdef CUSTOM_NOTEBOOK
793  static void on_notebook_button_clicked(GtkWidget *button, gpointer data) {  static void on_notebook_button_clicked(GtkWidget *button, gpointer data) {
794    GtkNotebook *nb =    GtkNotebook *nb =
795      GTK_NOTEBOOK(g_object_get_data(G_OBJECT(data), "notebook"));      GTK_NOTEBOOK(g_object_get_data(G_OBJECT(data), "notebook"));
# Line 792  static void on_notebook_button_clicked(G Line 797  static void on_notebook_button_clicked(G
797    gint page = (gint)g_object_get_data(G_OBJECT(button), "page");    gint page = (gint)g_object_get_data(G_OBJECT(button), "page");
798    gtk_notebook_set_current_page(nb, page);    gtk_notebook_set_current_page(nb, page);
799  }  }
800    #endif
801    
802  static void notebook_append_page(GtkWidget *notebook,  static void notebook_append_page(GtkWidget *notebook,
803                                   GtkWidget *page, char *label) {                                   GtkWidget *page, char *label) {
Legend:
Removed from v.178  
changed lines
  Added in v.184