Commit Graph

12 Commits

Author SHA1 Message Date
Georg Baum
399e6e788c Store colors as rgb values in branches.
* src/frontends/xforms/Color.[Ch]: move to src

	* src/Color.[Ch] (getRGBColor): move to src/frontends/*/lyx_gui.C

	* src/BranchList.h
	(Branch::color_): change type to lyx::RGBColor

	* src/BranchList.[Ch]
	(Branch): new constrcutor, set color_ to LColor::background
	(getColor, setColor): adapt to type change of color_

	* src/bufferparams.C
	(BufferParams::writeFile): adapt to type change of branch color

	* src/frontends/lyx_gui.h
	* src/frontends/gtk/lyx_gui.C
	* src/frontends/qt2/lyx_gui.C
	* src/frontends/qt4/lyx_gui.C
	* src/frontends/xforms/lyx_gui.C
	(getRGBColor): move from src/Color.[Ch] here

	* src/frontends/gtk/lyx_gui.C
	* src/frontends/xforms/lyx_gui.C
	(hexname): use getRGBColor

	* src/frontends/gtk/GDocument.C
	(update): adapt to type change of branch color
	(apply): add comment about color chooser

	* src/frontends/qt2/QDocumentDialog.C
	(updateBranchView): adapt to type change of branch color
	(toggleBranchColor): ditto

	* src/frontends/qt2/lcolorcache.[Ch]
	* src/frontends/qt4/lcolorcache.[Ch]
	(rgb2qcolor): new utility function

	* src/frontends/qt4/QBranches.C
	(QBranches::update): adapt to type change of branch color
	(QBranches::on_colorPB_clicked): ditto

	* src/frontends/xforms/FormDocument.C
	(get_current_color): adapt to type change of branch color
	(FormDocument::branch_update):

	* src/frontends/xforms/FormPreferences.C
	(FormPreferences::Colors::LoadBrowse): adapt to RGBColor changes

	* src/frontends/xforms/FormPreferences.h: remove unneeded RGBColor
	forward declaration 

	* src/frontends/xforms/XWorkArea.C
	(XWorkArea::XWorkArea): adapt to RGBColor changes

	* src/frontends/xforms/Makefile.am: remove Color.[Ch]

	* src/frontends/xforms/FormColorpicker.[Ch]: adapt to RGBColor changes

	* src/frontends/xforms/xformsImage.C: adapt to RGBColor changes

	* src/frontends/controllers/ControlDocument.C
	(ControlDocument::dispatchParams): adapt to type change of branch color

	* src/Makefile.am: add Color.[Ch]


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13466 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-23 20:04:05 +00:00
Jean-Marc Lasgouttes
b063595be8 bug 2081: Disallow insertion of marginal note in float table.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10582 a592a061-630c-0410-9148-cb99ea01b6c8
2005-11-02 11:27:08 +00:00
Angus Leeming
fb70c52b05 Whitespace, only whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9877 a592a061-630c-0410-9148-cb99ea01b6c8
2005-04-26 11:12:20 +00:00
Martin Vermeer
f6c4e1a9eb Fixing bugs 1844,1845: doc settings don't stick
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9751 a592a061-630c-0410-9148-cb99ea01b6c8
2005-03-27 13:31:04 +00:00
Lars Gullik Bjønnes
4b1212acf2 Some more functor work.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8303 a592a061-630c-0410-9148-cb99ea01b6c8
2004-01-05 17:33:57 +00:00
Angus Leeming
1cad117882 Overhaul the branches code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8247 a592a061-630c-0410-9148-cb99ea01b6c8
2003-12-14 16:33:56 +00:00
Lars Gullik Bjønnes
44cd0fc9a1 The std::string mammoth path.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7862 a592a061-630c-0410-9148-cb99ea01b6c8
2003-10-06 15:43:21 +00:00
Angus Leeming
ffdb0baea3 Get rid of trailing whitespace 'noise' in future patches for the
forseeable future.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7724 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-09 18:27:24 +00:00
Angus Leeming
236ea81bc5 Replace LString.h with support/std_string.h,
Lsstream.h with support/std_sstream.h,
support/LIstream.h with support/std_istream.h,
support/LOstream.h with support/std_ostream.h.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7685 a592a061-630c-0410-9148-cb99ea01b6c8
2003-09-05 17:23:11 +00:00
Angus Leeming
0be0fcfd59 If I ever see another licence blurb again, it'll be too soon...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7598 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-23 00:17:00 +00:00
André Pönitz
5fc41035a4 remove spurious semicolons in BranchList.h
fix branchlist crash


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7566 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-18 12:27:49 +00:00
Martin Vermeer
fd6cd728a3 The 'Branches' mega-patch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7560 a592a061-630c-0410-9148-cb99ea01b6c8
2003-08-17 11:28:23 +00:00