SF.net SVN: geany:[2969] trunk

[ntrel at users.sourceforge.net]

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.