Commit Graph

33 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
557d33b7e5 Fix compilation for clang 3.7 with libc++ 2021-04-06 12:07:42 +02:00
Jean-Marc Lasgouttes
90bceb65d3 Initialise correctly branch_list_id_
Reported by coverity.
2021-01-29 18:07:37 +01:00
Juergen Spitzmueller
514cd87970 Prevent branch background color from leaking out of the document
This is assured by a unique branchlist ID that is now part of the branch
color name
2021-01-21 08:09:41 +01:00
Juergen Spitzmueller
7b762ee950 Branch: Implement separate static colors in dark mode
Set colors now apply to the active mode only. Matching reversed colors
are produced for the other mode if no color is assigned yet.

File format change.
2021-01-19 17:04:04 +01:00
Juergen Spitzmueller
29f98ab245 Use isDarkMode() method 2021-01-19 08:37:05 +01:00
Juergen Spitzmueller
057753dc75 Allow semantic colors in branches and use semantic background color by default
Addresses most crucial part of #12075

File format change
2021-01-18 09:56:53 +01:00
Richard Kimberly Heck
83779e7972 Use range and rename private variable 2020-02-28 01:08:28 -05:00
Jürgen Spitzmüller
c8faa01f4f make branch-add-insert aware of the separator ("|") [bug #6621]
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34653 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 13:39:08 +00:00
Vincent van Ravesteijn
9d1f1e285c *List.h: Move the class documentation into the lyx::namespace to be picked up correctly by doxy.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34357 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-03 13:36:19 +00:00
Pavel Sanda
e5ce07206c BranchList:
*FilenameSuffix -> *FileNameSuffix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34244 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-21 01:19:35 +00:00
Jürgen Spitzmüller
e6f922009f * Add possibility to append active branch names to the output file name (#3105).
File format change.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30546 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-13 14:30:08 +00:00
Jürgen Spitzmüller
5fdd2daa9c * Add ability to rename branches (bug 4128).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30442 a592a061-630c-0410-9148-cb99ea01b6c8
2009-07-10 06:49:51 +00:00
André Pönitz
e5ae1a4b75 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26481 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-21 19:27:20 +00:00
Richard Heck
32f1dce79a Simplify things just a little bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24967 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-27 18:57:16 +00:00
André Pönitz
09df753df4 pimpl not needed here
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21395 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-02 23:42:27 +00:00
André Pönitz
a5263e0f92 introduce a header to forward declare std::string.
hope there are only conforming implementaions out there ;-}


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21312 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-31 22:40:34 +00:00
André Pönitz
02703f47bf I guess Windows folks are not too happy with files named color.h and Color.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18048 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 19:21:38 +00:00
André Pönitz
5008ee540f rename LColor into Color
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18046 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 17:34:20 +00:00
Bo Peng
00e305c9d9 Rename .C ==> .cpp for files in src, part one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18018 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 04:41:58 +00:00
Georg Baum
49070b4c00 Fix problem with non-ascii branch names by converting more stuff to
docstring.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15713 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-03 15:16:45 +00:00
André Pönitz
6c300f72a2 move everything into namespace lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15422 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-21 00:16:43 +00:00
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