SF.net SVN: geany:[4219] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Mon Sep 21 16:21:04 UTC 2009
Revision: 4219
http://geany.svn.sourceforge.net/geany/?rev=4219&view=rev
Author: ntrel
Date: 2009-09-21 16:21:03 +0000 (Mon, 21 Sep 2009)
Log Message:
-----------
Add & use ui_label_set_markup(), ui_label_new_bold().
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/build.c
trunk/src/dialogs.c
trunk/src/notebook.c
trunk/src/ui_utils.c
trunk/src/ui_utils.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-09-21 13:24:39 UTC (rev 4218)
+++ trunk/ChangeLog 2009-09-21 16:21:03 UTC (rev 4219)
@@ -13,6 +13,9 @@
* src/build.c:
Fix none filetype Build Commands dialog label.
Make group labels bold.
+ * src/build.c, src/ui_utils.h, src/dialogs.c, src/notebook.c,
+ src/ui_utils.c:
+ Add & use ui_label_set_markup(), ui_label_new_bold().
2009-09-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c 2009-09-21 13:24:39 UTC (rev 4218)
+++ trunk/src/build.c 2009-09-21 16:21:03 UTC (rev 4219)
@@ -1776,19 +1776,6 @@
} TableFields;
-static GtkWidget *ui_label_new_bold(const gchar *text)
-{
- GtkWidget *wid;
- gchar *str = g_strdup_printf("<b>%s</b>", text);
-
- wid = gtk_label_new(str);
- g_free(str);
-
- gtk_label_set_use_markup(GTK_LABEL(wid), TRUE);
- return wid;
-}
-
-
GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, TableData *table_data,
GeanyFiletype *ft)
{
Modified: trunk/src/dialogs.c
===================================================================
--- trunk/src/dialogs.c 2009-09-21 13:24:39 UTC (rev 4218)
+++ trunk/src/dialogs.c 2009-09-21 16:21:03 UTC (rev 4219)
@@ -1049,8 +1049,7 @@
gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1);
- title = g_strdup_printf("<b>%s</b>", base_name);
- label = gtk_label_new(title);
+ label = ui_label_new_bold(base_name);
gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
image = gtk_image_new_from_stock("gtk-file", GTK_ICON_SIZE_BUTTON);
@@ -1060,7 +1059,6 @@
gtk_container_add(GTK_CONTAINER(hbox), image);
gtk_container_add(GTK_CONTAINER(hbox), label);
gtk_container_add(GTK_CONTAINER(vbox), hbox);
- g_free(title);
table = gtk_table_new(8, 2, FALSE);
gtk_table_set_row_spacings(GTK_TABLE(table), 10);
Modified: trunk/src/notebook.c
===================================================================
--- trunk/src/notebook.c 2009-09-21 13:24:39 UTC (rev 4218)
+++ trunk/src/notebook.c 2009-09-21 16:21:03 UTC (rev 4219)
@@ -227,10 +227,8 @@
gtk_widget_modify_fg(menu_item_label, GTK_STATE_ACTIVE, color);
if (doc == current_doc)
- {
- setptr(base_name, g_strconcat("<b>", base_name, "</b>", NULL));
- gtk_label_set_markup(GTK_LABEL(menu_item_label), base_name);
- }
+ ui_label_set_markup(GTK_LABEL(menu_item_label), "<b>%s</b>", base_name);
+
g_free(base_name);
}
menu_item = gtk_separator_menu_item_new();
Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c 2009-09-21 13:24:39 UTC (rev 4218)
+++ trunk/src/ui_utils.c 2009-09-21 16:21:03 UTC (rev 4219)
@@ -1238,20 +1238,16 @@
GtkWidget *ui_frame_new_with_alignment(const gchar *label_text, GtkWidget **alignment)
{
GtkWidget *label, *align;
- GtkWidget *frame = gtk_frame_new (NULL);
- gchar *label_markup;
+ GtkWidget *frame = gtk_frame_new(NULL);
- gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+ gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE);
- align = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_container_add (GTK_CONTAINER (frame), align);
- gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 12, 0);
+ align = gtk_alignment_new(0.5, 0.5, 1, 1);
+ gtk_container_add(GTK_CONTAINER(frame), align);
+ gtk_alignment_set_padding(GTK_ALIGNMENT(align), 0, 0, 12, 0);
- label_markup = g_strconcat("<b>", label_text, "</b>", NULL);
- label = gtk_label_new (label_markup);
- gtk_frame_set_label_widget (GTK_FRAME (frame), label);
- gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- g_free(label_markup);
+ label = ui_label_new_bold(label_text);
+ gtk_frame_set_label_widget(GTK_FRAME(frame), label);
*alignment = align;
return frame;
@@ -2088,3 +2084,21 @@
g_list_free(list);
}
+
+/* return value is for macros */
+GtkWidget *ui_label_set_markup(GtkLabel *label, const gchar *format, ...)
+{
+ va_list a;
+ gchar *text;
+
+ va_start(a, format);
+ text = g_strdup_vprintf(format, a);
+ va_end(a);
+
+ gtk_label_set_text(label, text);
+ gtk_label_set_use_markup(label, TRUE);
+ g_free(text);
+ return GTK_WIDGET(label);
+}
+
+
Modified: trunk/src/ui_utils.h
===================================================================
--- trunk/src/ui_utils.h 2009-09-21 13:24:39 UTC (rev 4218)
+++ trunk/src/ui_utils.h 2009-09-21 16:21:03 UTC (rev 4219)
@@ -198,6 +198,12 @@
void ui_entry_add_clear_icon(GtkWidget *entry);
+
+#define ui_label_new_bold(text)\
+ ui_label_set_markup(GTK_LABEL(gtk_label_new(NULL)), "<b>%s</b>", text);
+
+GtkWidget *ui_label_set_markup(GtkLabel *label, const gchar *format, ...) G_GNUC_PRINTF(2, 3);
+
/* End of general widget functions */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list