← Back to branch summary

~bratsche/indicator-sound/icon-placement

« back to all changes in this revision

Viewing changes to src/title-widget.c

  • Committer: Conor Curran
  • Date: 2010-09-02 14:42:54 UTC
  • Revision ID: conor.curran@canonical.com-20100902144254-rq5n0tsbgc6t0oco
added the image as advised, still no showA

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/title-widget.c
58
58
                                                                                DbusmenuMenuitem* twin_item);
59
59
static void title_widget_style_name_text(TitleWidget* self);
60
60
 
61
 
G_DEFINE_TYPE (TitleWidget, title_widget, GTK_TYPE_MENU_ITEM);
 
61
G_DEFINE_TYPE (TitleWidget, title_widget, GTK_TYPE_IMAGE_MENU_ITEM);
62
62
 
63
63
 
64
64
 
87
87
  
88
88
        hbox = gtk_hbox_new(FALSE, 0);
89
89
        priv->hbox = hbox;
90
 
        priv->player_icon = indicator_image_helper("sound_icon");
91
 
 
 
90
 
 
91
                // Add image to the 'gutter'
 
92
        gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(self), TRUE);
 
93
 
 
94
        gint padding = 4;
 
95
        gtk_widget_style_get(GTK_WIDGET(self), "horizontal-padding", &padding, NULL);
 
96
 
 
97
        gint width, height;
 
98
        gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
 
99
 
 
100
        //priv->player_icon = indicator_image_helper("sound_icon");
 
101
        GtkWidget * icon = gtk_image_new_from_icon_name("sound_icon", GTK_ICON_SIZE_MENU);
 
102
        
 
103
        gtk_widget_set_size_request(icon, width
 
104
                                                                                                                        + 5 /* ref triangle is 5x9 pixels */
 
105
                                                                                                                        + 2 /* padding */,
 
106
                                                                                                                        height);
 
107
        gtk_misc_set_alignment(GTK_MISC(icon), 1.0 /* right aligned */, 0.5);
 
108
        gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(self), icon);
 
109
        gtk_widget_show(icon);
 
110
 
 
111
        GtkImageType type = gtk_image_get_storage_type(GTK_IMAGE(icon));
 
112
        g_debug("gtk_image_storage_type = %i", type);
 
113
        
 
114
        //gtk_container_add(GTK_CONTAINER(gmi), priv->hbox);    
92
115
        //gtk_box_pack_start(GTK_BOX (priv->hbox), priv->image_item, FALSE, FALSE, 0);          
93
116
}
94
117
 
143
166
        priv->twin_item = twin_item;
144
167
        g_signal_connect(G_OBJECT(twin_item), "property-changed", 
145
168
                         G_CALLBACK(title_widget_property_update), self);       
 
169
        // Add the application name
146
170
        priv->name = gtk_label_new(dbusmenu_menuitem_property_get(priv->twin_item, 
147
171
                                                                  DBUSMENU_TITLE_MENUITEM_NAME));
148
 
        gtk_misc_set_padding(GTK_MISC(priv->name), 10, 0);
 
172
        gtk_misc_set_padding(GTK_MISC(priv->name), 0, 0);
149
173
        gtk_box_pack_start (GTK_BOX (priv->hbox), priv->name, FALSE, FALSE, 0);         
150
174
 
151
175
        title_widget_style_name_text(self);
152
176
        
153
 
        gtk_widget_show_all (priv->hbox);
154
 
  gtk_container_add (GTK_CONTAINER (self), priv->hbox); 
 
177
  gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET(priv->hbox));     
 
178
        gtk_widget_show_all (priv->hbox);       
155
179
}
156
180
                           
157
181
static void