Revision: 2972
http://geany.svn.sourceforge.net/geany/?rev=2972&view=rev
Author: eht16
Date: 2008-09-18 13:25:13 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
Display also the style of the current position in the status bar when debug mode is enabled.
No need to make the debugging strings translatable in the status bar.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/ui_utils.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-18 12:43:41 UTC (rev 2971)
+++ trunk/ChangeLog 2008-09-18 13:25:13 UTC (rev 2972)
@@ -1,3 +1,11 @@
+2008-09-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/ui_utils.c:
+ Display also the style of the current position in the status bar
+ when debug mode is enabled.
+ No need to make the debugging strings translatable in the status bar.
+
+
2008-09-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/plugins.c:
Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c 2008-09-18 12:43:41 UTC (rev 2971)
+++ trunk/src/ui_utils.c 2008-09-18 13:25:13 UTC (rev 2972)
@@ -211,7 +211,9 @@
#ifdef GEANY_DEBUG
g_string_append(stats_str, sp);
- g_string_append_printf(stats_str, _("pos: %d"), pos);
+ g_string_append_printf(stats_str, "pos: %d", pos);
+ g_string_append(stats_str, sp);
+ g_string_append_printf(stats_str, "style: %d", sci_get_style_at(doc->editor->sci, pos));
#endif
/* can be overridden by status messages */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2969
http://geany.svn.sourceforge.net/geany/?rev=2969&view=rev
Author: ntrel
Date: 2008-09-18 11:41:27 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
Use wrap label for the first label in the plugin manager dialog.
Use scrolled window for plugin details text area to avoid resizing
dialog components if a plugin has a long description.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/plugins.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-17 18:08:52 UTC (rev 2968)
+++ trunk/ChangeLog 2008-09-18 11:41:27 UTC (rev 2969)
@@ -1,3 +1,11 @@
+2008-09-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/plugins.c:
+ Use wrap label for the first label in the plugin manager dialog.
+ Use scrolled window for plugin details text area to avoid resizing
+ dialog components if a plugin has a long description.
+
+
2008-09-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* data/filetypes.css, src/highlighting.c:
Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c 2008-09-17 18:08:52 UTC (rev 2968)
+++ trunk/src/plugins.c 2008-09-18 11:41:27 UTC (rev 2969)
@@ -1130,7 +1130,7 @@
static void pm_show_dialog(GtkMenuItem *menuitem, gpointer user_data)
{
- GtkWidget *vbox, *vbox2, *label_vbox, *hbox, *swin, *label, *label2;
+ GtkWidget *vbox, *vbox2, *label_vbox, *hbox, *swin, *label, *label2, *desc_win;
/* before showing the dialog, we need to create the list of available plugins */
load_all_plugins();
@@ -1155,7 +1155,7 @@
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_IN);
gtk_container_add(GTK_CONTAINER(swin), pm_widgets.tree);
- label = gtk_label_new(_("Below is a list of available plugins. "
+ label = geany_wrap_label_new(_("Below is a list of available plugins. "
"Select the plugins which should be loaded when Geany is started."));
pm_widgets.configure_button = gtk_button_new_from_stock(GTK_STOCK_PREFERENCES);
@@ -1166,7 +1166,13 @@
label2 = gtk_label_new(_("<b>Plugin details:</b>"));
gtk_label_set_use_markup(GTK_LABEL(label2), TRUE);
gtk_misc_set_alignment(GTK_MISC(label2), 0, 0.5);
+
pm_widgets.description_label = geany_wrap_label_new("");
+ desc_win = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(desc_win),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(desc_win),
+ pm_widgets.description_label);
hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), label2, TRUE, TRUE, 0);
@@ -1174,7 +1180,7 @@
label_vbox = gtk_vbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(label_vbox), hbox, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(label_vbox), pm_widgets.description_label, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(label_vbox), desc_win, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new(FALSE, 6);
gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 5);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2968
http://geany.svn.sourceforge.net/geany/?rev=2968&view=rev
Author: eht16
Date: 2008-09-17 18:08:52 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Mention Jay in the list of contributors.
Modified Paths:
--------------
trunk/src/about.c
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2008-09-17 18:06:02 UTC (rev 2967)
+++ trunk/src/about.c 2008-09-17 18:08:52 UTC (rev 2968)
@@ -78,9 +78,9 @@
static const gchar *contributors =
"Alexander Rodin, Anh Phạm, blackdog, Bo Lorentsen, Bob Doan, Catalin Marinas, "
"Christoph Berg, Daniel Richard G., Dave Moore, Dirk Weber, Felipe Pena, François Cami, "
-"Giuseppe Torelli, Guillaume Hoffmann, Jean-François Wauthy, Jeff Pohlmeyer, John Gabriele, "
-"Josef Whiter, Kevin Ellwood, Kristoffer A. Tjernås, Marko Peric, Matti Mårds, Peter Strand, "
-"Pierre Joye, Rob van der Linde, Robert McGinley, S Jagannathan, Saleem Abdulrasool, "
+"Giuseppe Torelli, Guillaume Hoffmann, Jason Oster, Jean-François Wauthy, Jeff Pohlmeyer, "
+"John Gabriele, Josef Whiter, Kevin Ellwood, Kristoffer A. Tjernås, Marko Peric, Matti Mårds, "
+"Peter Strand, Pierre Joye, Rob van der Linde, Robert McGinley, S Jagannathan, Saleem Abdulrasool, "
"Sebastian Kraft, Shiv, Slava Semushin, Stefan Oltmanns, Tamim, Tomás Vírseda, Yura Siamashka";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2963
http://geany.svn.sourceforge.net/geany/?rev=2963&view=rev
Author: eht16
Date: 2008-09-17 18:01:09 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Break lines at 100 characters.
Modified Paths:
--------------
trunk/src/sciwrappers.c
Modified: trunk/src/sciwrappers.c
===================================================================
--- trunk/src/sciwrappers.c 2008-09-17 18:00:37 UTC (rev 2962)
+++ trunk/src/sciwrappers.c 2008-09-17 18:01:09 UTC (rev 2963)
@@ -712,7 +712,8 @@
{
switch (lexer)
{
- /* These languages use indentation for control blocks; the "look forward" method works best here */
+ /* These languages use indentation for control blocks; the "look forward" method works
+ * best here */
case SCLEX_PYTHON:
case SCLEX_HASKELL:
case SCLEX_MAKEFILE:
@@ -749,7 +750,8 @@
void sci_set_indentation_guides(ScintillaObject *sci, gboolean enable)
{
gint lexer = sci_get_lexer(sci);
- SSM(sci, SCI_SETINDENTATIONGUIDES, (enable ? get_indent_guides_from_lexer(lexer) : SC_IV_NONE), 0);
+ SSM(sci, SCI_SETINDENTATIONGUIDES,
+ (enable ? get_indent_guides_from_lexer(lexer) : SC_IV_NONE), 0);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.