Changeset 35

Show
Ignore:
Timestamp:
11/02/07 18:45:47
Author:
pvanhoof
Message:
        • Don't show silly or obvious instructions in the instruction label
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/ChangeLog

    r33 r35  
    44        * Implemented deleting a message 
    55        * Added support for translations 
     6        * Don't show silly or obvious instructions in the instruction label 
    67 
    782007-11-01  Philip Van Hoof  <pvanhoof@gnome.org> 
  • trunk/src/tmut-folder-view.c

    r34 r35  
    352352                tmut_shell_window_set_child ( 
    353353                        tmut_shell_child_get_window (TMUT_SHELL_CHILD (self)),  
    354                         TMUT_SHELL_CHILD (view), _("Go back")); 
     354                        TMUT_SHELL_CHILD (view), NULL); 
    355355 
    356356        } 
  • trunk/src/tmut-main.c

    r34 r35  
    6161 
    6262        tmut_shell_window_set_child (TMUT_SHELL_WINDOW (window),  
    63                 TMUT_SHELL_CHILD (view), _("Select account or folder")); 
     63                TMUT_SHELL_CHILD (view), NULL); 
    6464 
    6565        tny_account_store_view_set_account_store (view, account_store); 
  • trunk/src/tmut-menu-view.c

    r34 r35  
    480480                        tmut_shell_window_set_child ( 
    481481                                tmut_shell_child_get_window (TMUT_SHELL_CHILD (self)),  
    482                                 TMUT_SHELL_CHILD (view), _("Select E-mail to view")); 
     482                                TMUT_SHELL_CHILD (view), NULL); 
    483483                        g_object_unref (folder); 
    484484                } 
  • trunk/src/tmut-shell-window.c

    r34 r35  
    6565        gtk_box_pack_start (GTK_BOX (priv->vbox), GTK_WIDGET (set->child),  
    6666                TRUE, TRUE, 0); 
    67         gtk_label_set_text (priv->instruction_label, set->instruction); 
     67 
     68        if (set->instruction) { 
     69                gtk_label_set_text (priv->instruction_label, set->instruction); 
     70                gtk_widget_show (GTK_WIDGET (priv->instruction_label)); 
     71        } else 
     72                gtk_widget_hide (GTK_WIDGET (priv->instruction_label)); 
    6873 
    6974        tmut_shell_child_set_window (set->child, self); 
     
    95100                gtk_box_pack_start (GTK_BOX (priv->vbox), GTK_WIDGET (priv->current->child),  
    96101                        TRUE, TRUE, 0); 
    97                 gtk_label_set_text (priv->instruction_label, priv->current->instruction); 
    98  
    99         } 
     102 
     103                if (priv->current->instruction) { 
     104                        gtk_label_set_text (priv->instruction_label, priv->current->instruction); 
     105                        gtk_widget_show (GTK_WIDGET (priv->instruction_label)); 
     106                } else 
     107                        gtk_widget_hide (GTK_WIDGET (priv->instruction_label)); 
     108 
     109                } 
    100110} 
    101111 
     
    142152        hbox = gtk_hbox_new (FALSE, 0); 
    143153        vvbox = gtk_vbox_new (FALSE, 0); 
    144         back_button = gtk_button_new_with_label ("<"); 
     154        back_button = gtk_button_new_with_label (_("<")); 
    145155        priv->progress_bar = GTK_PROGRESS_BAR (gtk_progress_bar_new ()); 
    146156        priv->instruction_label = GTK_LABEL (gtk_label_new ("")); 
     
    148158        gtk_widget_show (GTK_WIDGET (priv->progress_bar)); 
    149159        gtk_widget_show (back_button); 
    150         gtk_widget_show (GTK_WIDGET (priv->instruction_label)); 
     160        gtk_widget_hide (GTK_WIDGET (priv->instruction_label)); 
    151161        gtk_widget_show (priv->vbox); 
    152162        gtk_widget_show (hbox); 
     
    160170                TRUE, TRUE, 0); 
    161171        gtk_box_pack_start (GTK_BOX (vvbox), GTK_WIDGET (priv->progress_bar),  
    162                 FALSE, TRUE, 0); 
     172                TRUE, TRUE, 0); 
    163173        gtk_box_pack_start (GTK_BOX (vvbox), GTK_WIDGET (priv->instruction_label),  
    164174                FALSE, FALSE, 0);