SF.net SVN: geany: [1388] trunk

[ntrel at users.sourceforge.net]

Revision: 1388
          http://svn.sourceforge.net/geany/?rev=1388&view=rev
Author:   ntrel
Date:     2007-03-13 04:32:57 -0700 (Tue, 13 Mar 2007)

Log Message:
-----------
Use tab stops for status bar line, column and selection data to stop
the other fields being moved so often when browsing code or typing.
Rearrange status bar statistics to be clearer/more concise.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/ui_utils.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-03-12 16:30:15 UTC (rev 1387)
+++ trunk/ChangeLog	2007-03-13 11:32:57 UTC (rev 1388)
@@ -1,3 +1,11 @@
+2007-03-13  Nick Treleaven  <nick.treleaven at btinternet.com>
+
+ * src/ui_utils.c:
+   Use tab stops for status bar line, column and selection data to stop
+   the other fields being moved so often when browsing code or typing.
+   Rearrange status bar statistics to be clearer/more concise.
+
+
 2007-03-12  Enrico Tröger  <enrico.troeger at uvena.de>
 
  * doc/geany.docbook: Added description for disable-server command line

Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c	2007-03-12 16:30:15 UTC (rev 1387)
+++ trunk/src/ui_utils.c	2007-03-13 11:32:57 UTC (rev 1388)
@@ -113,18 +113,22 @@
 		else
 			col = 0;
 
-		text = g_strdup_printf(_("%c  line: % 4d column: % 3d  selection: % 4d   %s      mode: %s%s      cur. function: %s      encoding: %s %s     filetype: %s"),
-			(doc_list[idx].changed) ? 42 : 32,
+		/* Status bar statistics: col = column, sel = selection, RO = read-only,
+		 * OVR = overwrite/overtype, INS = insert, MOD = modified */
+		text = g_strdup_printf(_("line: %d\t col: %d\t sel: %d\t %s      %s      "
+			"mode: %s      encoding: %s %s      filetype: %s      scope: %s"),
 			(line + 1), col,
 			sci_get_selected_text_length(doc_list[idx].sci) - 1,
-			sci_get_overtype(doc_list[idx].sci) ? _("OVR") : _("INS"),
+			(doc_list[idx].readonly) ? _("RO ") :
+				(sci_get_overtype(doc_list[idx].sci) ? _("OVR") : _("INS")),
+			(doc_list[idx].changed) ? _("MOD") : "   ",
 			document_get_eol_mode(idx),
-			(doc_list[idx].readonly) ? ", read only" : "",
-			cur_tag,
 			(doc_list[idx].encoding) ? doc_list[idx].encoding : _("unknown"),
 			(encodings_is_unicode_charset(doc_list[idx].encoding)) ?
-				((doc_list[idx].has_bom) ? _("(with BOM)") : _("(without BOM)")) : "",
-			(doc_list[idx].file_type) ? doc_list[idx].file_type->title : _("unknown"));
+				((doc_list[idx].has_bom) ? _("(with BOM)") : "") : "",
+			(doc_list[idx].file_type) ? doc_list[idx].file_type->name :
+				filetypes[GEANY_FILETYPES_ALL]->name,
+			cur_tag);
 		set_statusbar(text, TRUE);	// can be overridden by status messages
 		g_free(text);
 	}


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