- Timestamp:
- Jan 30, 2006, 4:05:18 PM (17 years ago)
- Location:
- trunk/gtk
- Files:
-
- 2 edited
- 4 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/gtk/Jamfile
r11 r70 1 1 SubDir TOP gtk ; 2 2 3 GTK_SRC = conf.c main.c prefs.c util.c gtkcellrenderertorrent.c ;3 GTK_SRC = conf.c dialogs.c main.c trcellrenderertorrent.c util.c ; 4 4 5 5 Main transmission-gtk : $(GTK_SRC) ; -
trunk/gtk/dialogs.c
r69 r70 33 33 34 34 #include "conf.h" 35 #include " prefs.h"35 #include "dialogs.h" 36 36 #include "transmission.h" 37 37 #include "util.h" -
trunk/gtk/main.c
r51 r70 37 37 38 38 #include "conf.h" 39 #include "gtkcellrenderertorrent.h" 40 #include "prefs.h" 39 #include "dialogs.h" 41 40 #include "transmission.h" 41 #include "trcellrenderertorrent.h" 42 42 #include "util.h" 43 43 … … 467 467 gtk_tree_view_append_column(GTK_TREE_VIEW(view), col); 468 468 469 progrend = gtk_cell_renderer_torrent_new();469 progrend = tr_cell_renderer_torrent_new(); 470 470 g_object_set(progrend, "label", "<big> fnord fnord </big>", NULL); 471 471 col = gtk_tree_view_column_new_with_attributes("Progress", progrend, NULL); … … 494 494 stylekludge(GObject *obj, GParamSpec *spec, gpointer gdata) { 495 495 if(0 == strcmp("style", spec->name)) { 496 gtk_cell_renderer_torrent_reset_style(GTK_CELL_RENDERER_TORRENT(gdata));496 tr_cell_renderer_torrent_reset_style(TR_CELL_RENDERER_TORRENT(gdata)); 497 497 gtk_widget_queue_draw(GTK_WIDGET(obj)); 498 498 } -
trunk/gtk/trcellrenderertorrent.c
r69 r70 1 /* gtkcellrenderertorrent.c1 /* trcellrenderertorrent.c 2 2 * Copyright (C) 2002 Naba Kumar <kh_naba@users.sourceforge.net> 3 3 * heavily modified by Jörgen Scheibengruber <mfcn@gmx.de> … … 29 29 #include <gtk/gtk.h> 30 30 31 #include " gtkcellrenderertorrent.h"31 #include "trcellrenderertorrent.h" 32 32 #include "util.h" 33 33 34 34 enum { PROP_0, PROP_VALUE, PROP_TEXT, PROP_LABEL }; 35 35 36 struct _ GtkCellRendererTorrentPrivate {36 struct _TrCellRendererTorrentPrivate { 37 37 gfloat value; 38 38 gchar *text; … … 57 57 58 58 59 G_DEFINE_TYPE( GtkCellRendererTorrent, gtk_cell_renderer_torrent, GTK_TYPE_CELL_RENDERER);60 61 static void 62 gtk_cell_renderer_torrent_class_init (GtkCellRendererTorrentClass *klass) {59 G_DEFINE_TYPE(TrCellRendererTorrent, tr_cell_renderer_torrent, GTK_TYPE_CELL_RENDERER); 60 61 static void 62 tr_cell_renderer_torrent_class_init (TrCellRendererTorrentClass *klass) { 63 63 GObjectClass *object_class = G_OBJECT_CLASS (klass); 64 64 GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass); … … 88 88 89 89 g_type_class_add_private (object_class, 90 sizeof ( GtkCellRendererTorrentPrivate));91 } 92 93 static void 94 gtk_cell_renderer_torrent_init(GtkCellRendererTorrent *tcell) {90 sizeof (TrCellRendererTorrentPrivate)); 91 } 92 93 static void 94 tr_cell_renderer_torrent_init(TrCellRendererTorrent *tcell) { 95 95 tcell->priv = G_TYPE_INSTANCE_GET_PRIVATE( 96 tcell, GTK_TYPE_CELL_RENDERER_TORRENT, GtkCellRendererTorrentPrivate);96 tcell, GTK_TYPE_CELL_RENDERER_TORRENT, TrCellRendererTorrentPrivate); 97 97 tcell->priv->value = 0.0; 98 98 tcell->priv->text = g_strdup(""); … … 104 104 105 105 GtkCellRenderer* 106 gtk_cell_renderer_torrent_new(void) {106 tr_cell_renderer_torrent_new(void) { 107 107 return g_object_new (GTK_TYPE_CELL_RENDERER_TORRENT, NULL); 108 108 } … … 110 110 /* XXX need to do this better somehow */ 111 111 void 112 gtk_cell_renderer_torrent_reset_style(GtkCellRendererTorrent *tor) {112 tr_cell_renderer_torrent_reset_style(TrCellRendererTorrent *tor) { 113 113 if(NULL != tor->priv->style) { 114 114 gtk_style_detach(tor->priv->style); … … 120 120 static void 121 121 finalize(GObject *object) { 122 GtkCellRendererTorrent *tcell = GTK_CELL_RENDERER_TORRENT(object);122 TrCellRendererTorrent *tcell = TR_CELL_RENDERER_TORRENT(object); 123 123 124 124 g_free(tcell->priv->text); … … 134 134 } 135 135 136 G_OBJECT_CLASS ( gtk_cell_renderer_torrent_parent_class)->finalize(object);136 G_OBJECT_CLASS (tr_cell_renderer_torrent_parent_class)->finalize(object); 137 137 } 138 138 139 139 static void 140 140 get_property(GObject *object, guint id, GValue *value, GParamSpec *pspec) { 141 GtkCellRendererTorrent *tcell = GTK_CELL_RENDERER_TORRENT (object);141 TrCellRendererTorrent *tcell = TR_CELL_RENDERER_TORRENT (object); 142 142 143 143 switch (id) { … … 158 158 static void 159 159 set_property(GObject *obj, guint id, const GValue *value, GParamSpec *spec) { 160 GtkCellRendererTorrent *tcell = GTK_CELL_RENDERER_TORRENT(obj);160 TrCellRendererTorrent *tcell = TR_CELL_RENDERER_TORRENT(obj); 161 161 gchar **prop = NULL; 162 162 PangoAttrList **attrs = NULL; … … 206 206 get_size(GtkCellRenderer *cell, GtkWidget *widget, GdkRectangle *area, 207 207 gint *xoff, gint *yoff, gint *width, gint *height) { 208 GtkCellRendererTorrent *tcell = GTK_CELL_RENDERER_TORRENT(cell);208 TrCellRendererTorrent *tcell = TR_CELL_RENDERER_TORRENT(cell); 209 209 /* XXX do I have to unref the context? */ 210 210 PangoLayout *layout = pango_layout_new(gtk_widget_get_pango_context(widget)); … … 241 241 GdkRectangle *bg SHUTUP, GdkRectangle *area, GdkRectangle *exp SHUTUP, 242 242 guint flags) { 243 GtkCellRendererTorrent *tcell = GTK_CELL_RENDERER_TORRENT(cell);243 TrCellRendererTorrent *tcell = TR_CELL_RENDERER_TORRENT(cell); 244 244 PangoContext *ctx = gtk_widget_get_pango_context(widget); 245 245 PangoLayout *llayout, *tlayout; -
trunk/gtk/trcellrenderertorrent.h
r69 r70 1 /* gtkcellrenderertorrent.h1 /* trcellrenderertorrent.h 2 2 * Copyright (C) 2002 Naba Kumar <kh_naba@users.sourceforge.net> 3 3 * modified by Jörgen Scheibengruber <mfcn@gmx.de> … … 25 25 */ 26 26 27 #ifndef __ GTK_CELL_RENDERER_TORRENT_H__28 #define __ GTK_CELL_RENDERER_TORRENT_H__27 #ifndef __TR_CELL_RENDERER_TORRENT_H__ 28 #define __TR_CELL_RENDERER_TORRENT_H__ 29 29 30 30 #include <gtk/gtkcellrenderer.h> … … 32 32 G_BEGIN_DECLS 33 33 34 #define GTK_TYPE_CELL_RENDERER_TORRENT ( gtk_cell_renderer_torrent_get_type ())35 #define GTK_CELL_RENDERER_TORRENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_TORRENT, GtkCellRendererTorrent))36 #define GTK_CELL_RENDERER_TORRENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_TORRENT, GtkCellRendererTorrentClass))34 #define GTK_TYPE_CELL_RENDERER_TORRENT (tr_cell_renderer_torrent_get_type ()) 35 #define TR_CELL_RENDERER_TORRENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_TORRENT, TrCellRendererTorrent)) 36 #define TR_CELL_RENDERER_TORRENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_TORRENT, TrCellRendererTorrentClass)) 37 37 #define GTK_IS_CELL_RENDERER_TORRENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_TORRENT)) 38 38 #define GTK_IS_CELL_RENDERER_TORRENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_TORRENT)) 39 #define GTK_CELL_RENDERER_TORRENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TORRENT, GtkCellRendererTorrentClass))39 #define TR_CELL_RENDERER_TORRENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_TORRENT, TrCellRendererTorrentClass)) 40 40 41 typedef struct _ GtkCellRendererTorrent GtkCellRendererTorrent;42 typedef struct _ GtkCellRendererTorrentClass GtkCellRendererTorrentClass;43 typedef struct _ GtkCellRendererTorrentPrivate GtkCellRendererTorrentPrivate;41 typedef struct _TrCellRendererTorrent TrCellRendererTorrent; 42 typedef struct _TrCellRendererTorrentClass TrCellRendererTorrentClass; 43 typedef struct _TrCellRendererTorrentPrivate TrCellRendererTorrentPrivate; 44 44 45 struct _ GtkCellRendererTorrent45 struct _TrCellRendererTorrent 46 46 { 47 47 GtkCellRenderer parent_instance; 48 48 49 49 /*< private >*/ 50 GtkCellRendererTorrentPrivate *priv;50 TrCellRendererTorrentPrivate *priv; 51 51 }; 52 52 53 struct _ GtkCellRendererTorrentClass53 struct _TrCellRendererTorrentClass 54 54 { 55 55 GtkCellRendererClass parent_class; … … 62 62 }; 63 63 64 GType gtk_cell_renderer_torrent_get_type (void) G_GNUC_CONST;65 GtkCellRenderer* gtk_cell_renderer_torrent_new (void);66 void gtk_cell_renderer_torrent_reset_style(GtkCellRendererTorrent *);64 GType tr_cell_renderer_torrent_get_type (void) G_GNUC_CONST; 65 GtkCellRenderer* tr_cell_renderer_torrent_new (void); 66 void tr_cell_renderer_torrent_reset_style(TrCellRendererTorrent *); 67 67 68 68 G_END_DECLS 69 69 70 #endif /* __ GTK_CELL_RENDERER_TORRENT_H__ */70 #endif /* __TR_CELL_RENDERER_TORRENT_H__ */
Note: See TracChangeset
for help on using the changeset viewer.