Changeset 17

Show
Ignore:
Timestamp:
10/31/07 22:56:08
Author:
pvanhoof
Message:
        • UI preparations. Refactored the TMutMsgView type to be a GtkVBox

with a bunch of buttons and scrolled windows in it

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/ChangeLog

    r16 r17  
    33        * Deviced a method to pass around things to the screens, like an 
    44        instruction string to display to the user 
     5        * UI preparations. Refactored the TMutMsgView type to be a GtkVBox 
     6        with a bunch of buttons and scrolled windows in it 
    57 
    682007-10-29  Philip Van Hoof  <pvanhoof@gnome.org> 
  • trunk/src/tmut-msg-view.c

    r14 r17  
    3434        TMutShellWindow *shell; 
    3535        TnyMsgView *msg_view; 
    36         GtkScrolledWindow *widget
    37  
     36        GtkScrolledWindow *sw
     37        GtkButton *reply_button, *forward_button; 
    3838}; 
    3939 
     
    4242 
    4343 
     44 
     45static void 
     46on_reply_clicked (GtkButton *button, gpointer user_data) 
     47{ 
     48        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (user_data); 
     49 
     50        return; 
     51} 
     52 
     53 
     54static void 
     55on_forward_clicked (GtkButton *button, gpointer user_data) 
     56{ 
     57        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (user_data); 
     58 
     59        return; 
     60} 
    4461 
    4562static void 
     
    142159        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self); 
    143160 
     161 
    144162        if (G_UNLIKELY (priv->msg_view)) 
    145                 gtk_container_remove (GTK_CONTAINER (self), GTK_WIDGET (priv->msg_view)); 
     163                gtk_container_remove (GTK_CONTAINER (priv->sw), GTK_WIDGET (priv->msg_view)); 
    146164 
    147165        priv->msg_view = view; 
    148166 
    149         gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (self),  
     167        gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (priv->sw),  
    150168                        GTK_WIDGET (view)); 
    151169 
     
    173191tmut_msg_view_instance_init (GTypeInstance *instance, gpointer g_class) 
    174192{ 
     193        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (instance); 
     194        GtkWidget *hbox; 
     195 
     196        hbox = gtk_hbox_new (FALSE, 0); 
     197        priv->sw = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new (NULL, NULL)); 
     198        priv->reply_button = GTK_BUTTON (gtk_button_new_with_label ("Reply")); 
     199        priv->forward_button = GTK_BUTTON (gtk_button_new_with_label ("Forward")); 
     200 
     201        gtk_widget_show (hbox); 
     202        gtk_widget_show (GTK_WIDGET (priv->sw)); 
     203        gtk_widget_show (GTK_WIDGET (priv->reply_button)); 
     204        gtk_widget_show (GTK_WIDGET (priv->forward_button)); 
     205 
     206        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->sw),  
     207                GTK_SHADOW_NONE); 
     208        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw), 
     209                GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); 
     210 
     211        gtk_box_pack_start (GTK_BOX (instance), GTK_WIDGET (priv->sw), TRUE, TRUE, 0); 
     212        gtk_box_pack_start (GTK_BOX (instance), hbox, FALSE, TRUE, 0); 
     213        gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (priv->reply_button),  
     214                TRUE, TRUE, 0); 
     215        gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (priv->forward_button),  
     216                TRUE, TRUE, 0); 
     217 
     218        g_signal_connect (G_OBJECT (priv->reply_button), "clicked", 
     219                G_CALLBACK (on_reply_clicked), instance); 
     220        g_signal_connect (G_OBJECT (priv->forward_button), "clicked", 
     221                G_CALLBACK (on_forward_clicked), instance); 
    175222 
    176223        tmut_msg_view_set_view (TMUT_MSG_VIEW (instance), 
     
    299346                }; 
    300347 
    301                 type = g_type_register_static (GTK_TYPE_SCROLLED_WINDOW
     348                type = g_type_register_static (GTK_TYPE_VBOX
    302349                        "TMutMsgView", 
    303350                        &info, 0); 
  • trunk/src/tmut-msg-view.h

    r13 r17  
    4141struct _TMutMsgView 
    4242{ 
    43         GtkScrolledWindow parent; 
     43        GtkVBox parent; 
    4444}; 
    4545 
    4646struct _TMutMsgViewClass 
    4747{ 
    48         GtkScrolledWindowClass parent_class; 
     48        GtkVBoxClass parent_class; 
    4949}; 
    5050