table selection fix from John; Here & wide figures fix from Michael K.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3284 a592a061-630c-0410-9148-cb99ea01b6c8

po/POTFILES.in

@@ -9,7 +9,6 @@ src/converter.C
 src/CutAndPaste.C
 src/debug.C
 src/exporter.C
-src/ext_l10n.h
 src/figure_form.C
 src/figureForm.C
 src/FontLoader.C

src/frontends/controllers/ChangeLog

@@ -1,3 +1,8 @@
+2001-12-11  Michael A. Koziarski <michael@koziarski.org>
+
+	* ControlFloat.[Ch]: changes to prevent here definitely being used
+	with wide figures.
+
 2001-12-19  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* ControlThesaurus.h: do not include <config.h> in header files

src/frontends/controllers/ControlFloat.C

@@ -57,10 +57,12 @@ FloatParams const ControlFloat::getParams(InsetFloat const & inset)
 
 
 FloatParams::FloatParams()
-	: placement("htbp")
+	: placement("htbp"),
+	  allow_here_definitely(true)
 {}
 
 
 FloatParams::FloatParams(InsetFloat const & inset)
-	: placement(inset.placement())
+	: placement(inset.placement()), 
+	  allow_here_definitely(!inset.wide())
 {}

src/frontends/controllers/ControlFloat.h

@@ -32,13 +32,15 @@ struct FloatParams {
 	FloatParams(InsetFloat const &);
 	///
 	string placement;
+	///
+	bool allow_here_definitely;
 };
 
 
 inline
 bool operator==(FloatParams const & p1, FloatParams const & p2) 
 {
-	return p1.placement == p2.placement;
+	return p1.placement == p2.placement && p1.allow_here_definitely == p2.allow_here_definitely;
 }
 
 

src/frontends/xforms/ChangeLog

@@ -1,3 +1,8 @@
+2001-12-11  Michael A. Koziarski <michael@koziarski.org>
+
+	* FormFloat.C: changes to prevent here definitely being used
+	with wide figures.
+
 2001-12-29  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* FormMathsMatrix.C (AlignFilter): Allow entering the '|' char.

src/frontends/xforms/FormFloat.C

@@ -21,6 +21,7 @@
 #include "FormFloat.h"
 #include "form_float.h"
 #include "support/lstrings.h"
+#include "xforms_helpers.h"
 
 typedef FormCB<ControlFloat, FormDB<FD_form_float> > base_class;
 
@@ -105,6 +106,7 @@ void FormFloat::update()
 	fl_set_button(dialog_->radio_page, page);
 	fl_set_button(dialog_->radio_here, here);
 	fl_set_button(dialog_->button_here_definitely, here_definitely);
+	setEnabled(dialog_->button_here_definitely, controller().params().allow_here_definitely);
 }
 
 

src/insets/ChangeLog

@@ -1,3 +1,7 @@
+2001-12-31  John Levon  <moz@compsoc.man.ac.uk>
+
+	* insettabular.C: correct single-cell select vertically
+ 
 2001-12-27  Juergen Vigna  <jug@sad.it>
 
 	* insettabular.C (ascii): export as tab-separated-values if the

src/insets/insettabular.C

@@ -961,14 +961,16 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action,
 		int const ocell = actcell;
 		// if we are starting a selection, only select
 		// the current cell at the beginning
-		if (hasSelection()) { 
+		if (hasSelection()) {
 			moveDown(bv, false);
+			if ((ocell == sel_cell_end) ||
+			    (tabular->column_of_cell(ocell)>tabular->column_of_cell(actcell)))
+				setSelection(start, tabular->GetCellBelow(sel_cell_end));
+			else
+				setSelection(start, tabular->GetLastCellBelow(sel_cell_end));
+		} else {
+			setSelection(start, start);
 		}
-		if ((ocell == sel_cell_end) ||
-		    (tabular->column_of_cell(ocell)>tabular->column_of_cell(actcell)))
-			setSelection(start, tabular->GetCellBelow(sel_cell_end));
-		else
-			setSelection(start, tabular->GetLastCellBelow(sel_cell_end));
 		updateLocal(bv, SELECTION, false);
 	}
 	break;
@@ -986,12 +988,14 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action,
 		// the current cell at the beginning
 		if (hasSelection()) {
 			moveUp(bv, false);
+			if ((ocell == sel_cell_end) ||
+			    (tabular->column_of_cell(ocell)>tabular->column_of_cell(actcell)))
+				setSelection(start, tabular->GetCellAbove(sel_cell_end));
+			else
+				setSelection(start, tabular->GetLastCellAbove(sel_cell_end));
+		} else {
+			setSelection(start, start);
 		}
-		if ((ocell == sel_cell_end) ||
-		    (tabular->column_of_cell(ocell)>tabular->column_of_cell(actcell)))
-			setSelection(start, tabular->GetCellAbove(sel_cell_end));
-		else
-			setSelection(start, tabular->GetLastCellAbove(sel_cell_end));
 		updateLocal(bv, SELECTION, false);
 	}
 	break;