[Aptitude-svn-commit] r3315 - in branches/aptitude-0.3/aptitude: . src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Mon Jun  6 17:50:10 2005
New Revision: 3315

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_minibuf_win.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_minibuf_win.h
Log:
Update the minibuf-win.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Jun  6 17:50:10 2005
@@ -1,5 +1,9 @@
 2005-06-06  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_minibuf_win.:h:
+
+	Update the minibuf-win for the new display protocol.
+
 	* src/vscreen/vs_multiplex.cc, src/vscreen/vs_multiplex.h:
 
 	Update the multiplexer for the new display protocol.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_minibuf_win.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_minibuf_win.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_minibuf_win.cc	Mon Jun  6 17:50:10 2005
@@ -32,9 +32,9 @@
   do_layout.connect(sigc::mem_fun(*this, &vs_minibuf_win::layout_me));
 
   status=new vs_multiplex;
-  status_lbl=new vs_label("", get_color("ScreenStatusColor"));
+  status_lbl=new vs_label("", get_style("ScreenStatusColor"));
   status->add_widget(status_lbl);
-  header=new vs_label("", get_color("ScreenHeaderColor"));
+  header=new vs_label("", get_style("ScreenHeaderColor"));
 
   status->set_owner(this);
   header->set_owner(this);
@@ -110,23 +110,23 @@
     }
 }
 
-void vs_minibuf_win::paint()
+void vs_minibuf_win::paint(const style &st)
 {
   if(main_widget && main_widget->get_visible())
-    main_widget->display();
+    main_widget->display(st);
 
-  status->display();
-  header->display();
+  status->display(st);
+  header->display(st);
 }
 
 void vs_minibuf_win::set_header(string new_header)
 {
-  header->set_text(new_header, get_color("ScreenHeaderColor"));
+  header->set_text(new_header, get_style("ScreenHeaderColor"));
 }
 
 void vs_minibuf_win::set_status(string new_status)
 {
-  status_lbl->set_text(new_status, get_color("ScreenStatusColor"));
+  status_lbl->set_text(new_status, get_style("ScreenStatusColor"));
 }
 
 void vs_minibuf_win::add_widget(vscreen_widget *widget)
@@ -163,5 +163,5 @@
 
 void vs_minibuf_win::display_error(string err)
 {
-  add_widget(new vs_transientlabel(err, get_color("Error")|A_BOLD));
+  add_widget(new vs_transientlabel(err, get_style("Error")));
 }

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_minibuf_win.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_minibuf_win.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_minibuf_win.h	Mon Jun  6 17:50:10 2005
@@ -60,7 +60,7 @@
   int height_request(int w);
   void layout_me();
 
-  virtual void paint();
+  virtual void paint(const style &st);
 
   void show_header();
   void show_status();