← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vmware-view-open-client/maverick

« back to all changes in this revision

Viewing changes to gtk/transitionDlg.cc

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2010-06-04 17:45:04 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20100604174504-zjltuc0hdp4mv7de
Tags: 4.5.0-264434+dfsg-1
* Merging upstream version 4.5.0-264434+dfsg.
* Updating date and version header in manpage.
* Rediffing doc-pdf.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/transitionDlg.cc
29
29
 */
30
30
 
31
31
 
32
 
#include <glib/gi18n.h>
33
32
#include <gtk/gtk.h>
34
33
 
35
34
 
57
56
 */
58
57
 
59
58
TransitionDlg::TransitionDlg(TransitionType type,         // IN
60
 
                             const Util::string &message) // IN
 
59
                             const Util::string &message, // IN
 
60
                             bool useMarkup)              // IN/OPT
61
61
   : mImage(gtk_image_new()),
62
62
     mFrame(0),
63
63
     mRate(0),
64
64
     mTimeout(0),
65
 
     mTransitionType(type)
 
65
     mTransitionType(type),
 
66
     mLabel(NULL)
66
67
{
67
68
   GtkWidget *box = gtk_vbox_new(false, 3 * VM_SPACING);
68
69
   Init(box);
76
77
   g_signal_connect(mImage, "unrealize",
77
78
                    G_CALLBACK(&TransitionDlg::OnImageUnrealized), this);
78
79
 
79
 
   GtkWidget *label = gtk_label_new(message.c_str());
80
 
   gtk_widget_show(label);
81
 
   gtk_box_pack_start_defaults(GTK_BOX(box), label);
82
 
   gtk_label_set_line_wrap(GTK_LABEL(label), true);
 
80
   mLabel = GTK_LABEL(gtk_label_new(message.c_str()));
 
81
   gtk_widget_show(GTK_WIDGET(mLabel));
 
82
   gtk_box_pack_start_defaults(GTK_BOX(box), GTK_WIDGET(mLabel));
 
83
   gtk_label_set_line_wrap(mLabel, true);
 
84
   gtk_label_set_use_markup(mLabel, useMarkup);
 
85
   g_object_add_weak_pointer(G_OBJECT(mLabel), (gpointer *)&mLabel);
83
86
}
84
87
 
85
88
 
397
400
}
398
401
 
399
402
 
 
403
/*
 
404
 *-----------------------------------------------------------------------------
 
405
 *
 
406
 * cdk::TransitionDlg::SetMessage --
 
407
 *
 
408
 *      Set the message text of the transition dialog.
 
409
 *
 
410
 * Results:
 
411
 *      None
 
412
 *
 
413
 * Side effects:
 
414
 *      None
 
415
 *
 
416
 *-----------------------------------------------------------------------------
 
417
 */
 
418
 
 
419
void
 
420
TransitionDlg::SetMessage(const Util::string &message) // IN
 
421
{
 
422
   ASSERT(mLabel);
 
423
 
 
424
   gtk_label_set_label(mLabel, message.c_str());
 
425
}
 
426
 
 
427
 
400
428
} // namespace cdk