← Back to branch summary

~ubuntu-branches/ubuntu/utopic/synaptic/utopic-proposed

« back to all changes in this revision

Viewing changes to gtk/rgterminstallprogress.cc

  • Committer: Package Import Robot
  • Author(s): Michael Vogt
  • Date: 2013-09-14 13:31:10 UTC
  • Revision ID: package-import@ubuntu.com-20130914133110-48927mxdqfkmxi0k
Tags: 0.80.4
http://bugs.debian.org/710030
http://bugs.debian.org/710030
* gtk/rgdebinstallprogress.cc:
  - add workaround for vte terminal not resizing to 80x24,
    thanks to Filipus Klutier (closes: #710030)
* gtk/rgterminstallprogress.cc:
  - force terminal size to 80x24 (closes: #710030)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/rgterminstallprogress.cc
62
62
   setTitle(_("Applying Changes"));
63
63
 
64
64
   _term = vte_terminal_new();
 
65
   vte_terminal_set_size(VTE_TERMINAL(_term),80,23);
65
66
   _scrollbar = gtk_vscrollbar_new (vte_terminal_get_adjustment(VTE_TERMINAL(_term)));
66
67
   gtk_widget_set_can_focus (_scrollbar, FALSE);
67
68
   vte_terminal_set_scrollback_lines(VTE_TERMINAL(_term), 10000);
71
72
   } else {
72
73
      vte_terminal_set_font_from_string(VTE_TERMINAL(_term), "monospace 10");
73
74
   }
74
 
 
 
75
   GtkWidget *box = GTK_WIDGET(gtk_builder_get_object(_builder,"hbox_vte"));
 
76
   gtk_box_pack_start(GTK_BOX(box), _term, TRUE, TRUE, 0);
 
77
   gtk_box_pack_end(GTK_BOX(box), _scrollbar, FALSE, FALSE, 0);
 
78
   gtk_widget_show(_term);
 
79
   gtk_widget_show(_scrollbar);
75
80
 
76
81
   _closeOnF = GTK_WIDGET(gtk_builder_get_object(_builder,
77
82
                                                 "checkbutton_close_after_pm"));
106
111
{
107
112
   GtkWidget *win =  GTK_WIDGET(gtk_builder_get_object
108
113
                                (_builder, "window_zvtinstallprogress"));
109
 
   GtkWidget *hbox = GTK_WIDGET(gtk_builder_get_object
110
 
                                (_builder, "hbox_terminal"));
111
 
   assert(hbox);
112
114
   gtk_widget_show_all(win);
113
 
   gtk_box_pack_start(GTK_BOX(hbox), _term, TRUE, TRUE, 0);
114
 
   gtk_box_pack_end(GTK_BOX(hbox), _scrollbar, FALSE, FALSE, 0);
115
 
   gtk_widget_show(_term);
116
 
   gtk_widget_show(_scrollbar);
117
115
 
118
116
   child_has_exited=false;
119
117
   VteReaper* reaper = vte_reaper_get();