Do not error out if -geometry is used with QPA_XCB defined.

[lyx.git] / src / ColorCode.h

diff --git a/src/ColorCode.h b/src/ColorCode.h
index 4d391c008142913a41a4d5d1271d16f88a62639f..9b26e7219ccbc9e826f953379c4c2456b2754a01 100644 (file)
--- a/src/ColorCode.h
+++ b/src/ColorCode.h
@@ -21,16 +21,38 @@ enum ColorCode {
        ///
        Color_white,
        ///
-       Color_red,
+       Color_blue,
+       ///
+       Color_brown,
+       ///
+       Color_cyan,
+       ///
+       Color_darkgray,
+       ///
+       Color_gray,
        ///
        Color_green,
        ///
-       Color_blue,
+       Color_lightgray,
        ///
-       Color_cyan,
+       Color_lime,
        ///
        Color_magenta,
        ///
+       Color_olive,
+       ///
+       Color_orange,
+       ///
+       Color_pink,
+       ///
+       Color_purple,
+       ///
+       Color_red,
+       ///
+       Color_teal,
+       ///
+       Color_violet,
+       ///
        Color_yellow,
 
        // Needed interface colors
@@ -43,6 +65,8 @@ enum ColorCode {
        Color_foreground,
        /// Background color of selected text
        Color_selection,
+       /// Foreground color of selected math
+       Color_selectionmath,
        /// Foreground color of selected text
        Color_selectiontext,
        /// Text color in LaTeX mode
@@ -86,6 +110,13 @@ enum ColorCode {
        /// Label color for URL insets
        Color_urllabel,
 
+       /// Label color 1 for text (layout) labels
+       Color_textlabel1,
+       /// Label color 2 for text (layout) labels
+       Color_textlabel2,
+       /// Label color 3 for text (layout) labels
+       Color_textlabel3,
+
        /// Color for URL inset text
        Color_urltext,
 
@@ -120,28 +151,30 @@ enum ColorCode {
        Color_mathmacrolabel,
        /// Macro math frame color
        Color_mathmacroframe,
-       /// Macro math blended color 
+       /// Macro math blended color
        Color_mathmacroblend,
-       /// Macro template color for old parameters 
+       /// Macro template color for old parameters
        Color_mathmacrooldarg,
-       /// Macro template color for new parameters 
+       /// Macro template color for new parameters
        Color_mathmacronewarg,
        /// Math inset frame color under focus
        Color_mathframe,
        /// Math inset frame color not under focus
        Color_mathcorners,
-       /// Math line color
+       /// Math empty box line color
        Color_mathline,
 
-       /// Collapsable insets text
-       Color_collapsable,
-       /// Collapsable insets frame
-       Color_collapsableframe,
+       /// Collapsible insets text
+       Color_collapsible,
+       /// Collapsible insets frame
+       Color_collapsibleframe,
 
        /// Inset marker background color
        Color_insetbg,
        /// Inset marker frame color
        Color_insetframe,
+       /// Inset marker label color
+       Color_insetlabel,
 
        /// Error box text color
        Color_error,
@@ -153,22 +186,24 @@ enum ColorCode {
        Color_appendix,
        /// Changebar color
        Color_changebar,
-       /// Deleted text color
-       Color_deletedtext,
-       /// Added text color
-       Color_addedtext,
-       /// Changed text color author 1
-       Color_changedtextauthor1,
-       /// Changed text color author 2
-       Color_changedtextauthor2,
-       /// Changed text color author 3
-       Color_changedtextauthor3,
-       /// Changed text color author 4
-       Color_changedtextauthor4,
-       /// Changed text color author 5
-       Color_changedtextauthor5,
-       /// Deleted text modifying color
-       Color_deletedtextmodifier,
+       /// Deleted text color (exported output) in CT
+       Color_deletedtext_output,
+       /// Added text color (exported output) in CT
+       Color_addedtext_output,
+       /// Changed text color author 1 (workarea)
+       Color_changedtext_workarea_author1,
+       /// Changed text color author 2 (workarea)
+       Color_changedtext_workarea_author2,
+       /// Changed text color author 3 (workarea)
+       Color_changedtext_workarea_author3,
+       /// Changed text color author 4 (workarea)
+       Color_changedtext_workarea_author4,
+       /// Changed text color author 5 (workarea)
+       Color_changedtext_workarea_author5,
+       /// Changed text color document comparison (workarea)
+       Color_changedtext_workarea_comparison,
+       /// Deleted text modifying color (for brightness modulation) (workarea)
+       Color_deletedtext_workarea_modifier,
        /// Table line color
        Color_tabularline,
        /// Table line color
@@ -185,12 +220,22 @@ enum ColorCode {
        Color_buttonframe,
        /// Color used for bottom background
        Color_buttonbg,
-       /// Color used for buttom under focus
+       /// Color used for button under focus
        Color_buttonhoverbg,
+       /// Text color for broken insets
+       Color_command_broken,
+       /// Background color for broken insets
+       Color_buttonbg_broken,
+       /// Frame color for broken insets
+       Color_buttonframe_broken,
+       /// Color used for broken inset button under focus
+       Color_buttonhoverbg_broken,
        /// Color used for the pilcrow sign to mark the end of a paragraph
        Color_paragraphmarker,
        /// Preview frame color
        Color_previewframe,
+       /// Bookmark indicator color
+       Color_bookmark,
 
        // Logical attributes
 
@@ -199,7 +244,8 @@ enum ColorCode {
        /// Color for regexp frame
        Color_regexpframe,
        /// For ignoring updates of a color
-       Color_ignore
+       Color_ignore,
+       Color_max = 500
 };