[Aptitude-devel] r3049 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Sat Apr 23 00:04:37 2005
New Revision: 3049

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/pkg_view.cc
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Move the broken indicator into the status bar for now.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr 23 00:04:37 2005
@@ -1,5 +1,9 @@
 2005-04-22  Daniel Burrows  <dburrows@debian.org>
 
+	* src/pkg_view.cc, src/ui.cc:
+
+	  Move the broken indicator into the status bar area.
+
 	* src/broken_indicator.cc:
 
 	  Hide an inactive indicator; correctly handle cache reloading.

Modified: branches/aptitude-0.3/aptitude/src/pkg_view.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_view.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_view.cc	Sat Apr 23 00:04:37 2005
@@ -6,7 +6,6 @@
 
 #include "aptitude.h"
 
-#include "broken_indicator.h"
 #include "desc_parse.h"
 #include "edit_pkg_hier.h"
 #include "menu_redirect.h"
@@ -385,9 +384,6 @@
 	    wt->add_widget_opts(w, 0, 0, 1, 1, vs_table::EXPAND | vs_table::SHRINK, vs_table::EXPAND | vs_table::SHRINK);
 	    wt->add_widget_opts(ws, 0, 1, 1, 1, vs_table::ALIGN_RIGHT, vs_table::ALIGN_CENTER | vs_table::FILL);
 
-	    wt->add_widget_opts(make_broken_indicator(),
-				1, 0, 1, 2, vs_table::EXPAND, vs_table::EXPAND);
-
 	    lt->add_widget_opts(l, 0, 0, 1, 1, vs_table::EXPAND | vs_table::SHRINK, vs_table::EXPAND | vs_table::SHRINK);
 	    lt->add_widget_opts(ls, 0, 1, 1, 1, vs_table::ALIGN_RIGHT, vs_table::ALIGN_CENTER | vs_table::FILL);
 

Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc	Sat Apr 23 00:04:37 2005
@@ -1,6 +1,23 @@
 // ui.cc
 //
-//  Copyright 2000-2002 Daniel Burrows <Daniel_Burrows@brown.edu>
+//  Copyright 2000-2005 Daniel Burrows <dburrows@debian.org>
+//
+//   Copyright (C) 2005 Daniel Burrows
+//
+//   This program is free software; you can redistribute it and/or
+//   modify it under the terms of the GNU General Public License as
+//   published by the Free Software Foundation; either version 2 of
+//   the License, or (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//   General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program; see the file COPYING.  If not, write to
+//   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+//   Boston, MA 02111-1307, USA.
 //
 //  Various UI glue-code and routines.
 
@@ -27,6 +44,7 @@
 #include "aptitude.h"
 
 #include "apt_options.h"
+#include "broken_indicator.h"
 #include "defaults.h"
 #include "load_config.h"
 #include "load_grouppolicy.h"
@@ -1561,6 +1579,7 @@
   main_status_multiplex->show();
 
   main_status_multiplex->add_widget(menu_description);
+  main_status_multiplex->add_widget(make_broken_indicator());
 
   main_menu->show();