SF.net SVN: geany: [584] trunk

[eht16 at users.sourceforge.net]

Revision: 584
Author:   eht16
Date:     2006-07-19 02:45:56 -0700 (Wed, 19 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=584&view=rev

Log Message:
-----------
Highlighting of current line can be disabled.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/data/filetypes.common
    trunk/src/highlighting.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-07-18 22:01:24 UTC (rev 583)
+++ trunk/ChangeLog	2006-07-19 09:45:56 UTC (rev 584)
@@ -1,8 +1,7 @@
-2006-07-18  Enrico Troeger  <enrico.troeger at uvena.de>
+2006-07-19  Enrico Tröger  <enrico.troeger at uvena.de>
 
- * src/notebook.c:
-   Compile notebook_motion_notify_event_cb() only with GTK 2.6 (again).
- * src/about.c: Made "built on" string translatable.
+ * src/highlighting.c, data/filetypes.common:
+   Highlighting of current line can be disabled.
 
 
 2006-07-18  Nick Treleaven  <nick.treleaven at btinternet.com>
@@ -17,7 +16,6 @@
    Use more POSIX-like syntax for regular expression bracket matching.
    Prevent searching backwards with a regex (unsupported).
    Scroll in view after the last replacement for replace all/selection.
-   
 
 
 2006-07-18  Enrico Tröger  <enrico.troeger at uvena.de>
@@ -27,6 +25,9 @@
  * doc/Makefile.am: Reverted last change, we want to use xmlto.
  * src/encodings.c: Restored original order of the encodings, kept the
                     sorted order in the document menu.
+ * src/notebook.c:
+   Compile notebook_motion_notify_event_cb() only with GTK 2.6 (again).
+ * src/about.c: Made "built on" string translatable.
 
 
 2006-07-17  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/data/filetypes.common
===================================================================
--- trunk/data/filetypes.common	2006-07-18 22:01:24 UTC (rev 583)
+++ trunk/data/filetypes.common	2006-07-19 09:45:56 UTC (rev 584)
@@ -9,8 +9,9 @@
 # the following settings define the colours of the margins on the left side
 margin_linenumber=0x000000;0xd0d0d0;false;false
 margin_folding=0x000000;0xdfdfdf;false;false
-# background colour of the current line, only the second argument is interpreted
-current_line=0x0;0xE5E5E5;false;false
+# background colour of the current line, only the second and third argument is interpreted
+# use the third argument to enable or disable the highlighting of the current line (has to be true/false)
+current_line=0x0;0xe5e5e5;true;false
 # style of folding icons, only first and second arguments are used, valid values are:
 # first argument:  1 for boxes, 2 for circles
 # second argument: 1 for straight lines, 2 for curved lines

Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c	2006-07-18 22:01:24 UTC (rev 583)
+++ trunk/src/highlighting.c	2006-07-19 09:45:56 UTC (rev 584)
@@ -201,7 +201,7 @@
 	styleset_get_hex(config, config_home, "styling", "brace_bad", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_ALL]->styling[3]);
 	styleset_get_hex(config, config_home, "styling", "margin_linenumber", "0x000000", "0xd0d0d0", "false", types[GEANY_FILETYPES_ALL]->styling[4]);
 	styleset_get_hex(config, config_home, "styling", "margin_folding", "0x000000", "0xdfdfdf", "false", types[GEANY_FILETYPES_ALL]->styling[5]);
-	styleset_get_hex(config, config_home, "styling", "current_line", "0x000000", "0xE5E5E5", "false", types[GEANY_FILETYPES_ALL]->styling[6]);
+	styleset_get_hex(config, config_home, "styling", "current_line", "0x000000", "0xe5e5e5", "true", types[GEANY_FILETYPES_ALL]->styling[6]);
 	styleset_get_int(config, config_home, "styling", "folding_style", 1, 1, types[GEANY_FILETYPES_ALL]->styling[7]);
 	styleset_get_int(config, config_home, "styling", "invert_all", 0, 0, types[GEANY_FILETYPES_ALL]->styling[8]);
 
@@ -230,7 +230,7 @@
 
 	// colourize the current line
 	SSM(sci, SCI_SETCARETLINEBACK, invert(types[GEANY_FILETYPES_ALL]->styling[6][1]), 0);
-	SSM(sci, SCI_SETCARETLINEVISIBLE, 1, 0);
+	SSM(sci, SCI_SETCARETLINEVISIBLE, types[GEANY_FILETYPES_ALL]->styling[6][2], 0);
 
 	// indicator settings
 	SSM(sci, SCI_INDICSETSTYLE, 2, INDIC_SQUIGGLE);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.