Mercurial > audlegacy
changeset 1788:80b6282a31ae trunk
[svn] - implement mainwinOthertextIsStatus property.
| author | nenolod |
|---|---|
| date | Wed, 04 Oct 2006 18:48:49 -0700 |
| parents | d1ef4890fb44 |
| children | 869c0ae9f61b |
| files | ChangeLog audacious/mainwin.c audacious/widgets/skin.c audacious/widgets/skin.h |
| diffstat | 4 files changed, 35 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 04 18:21:40 2006 -0700 +++ b/ChangeLog Wed Oct 04 18:48:49 2006 -0700 @@ -1,3 +1,11 @@ +2006-10-05 01:21:40 +0000 William Pitcock <nenolod@nenolod.net> + revision [2531] + - update hints file + + trunk/skin/skin.hints | 1 + + 1 file changed, 1 insertion(+) + + 2006-10-04 23:00:03 +0000 William Pitcock <nenolod@nenolod.net> revision [2529] - add:
--- a/audacious/mainwin.c Wed Oct 04 18:21:40 2006 -0700 +++ b/audacious/mainwin.c Wed Oct 04 18:48:49 2006 -0700 @@ -778,18 +778,32 @@ } } +static gchar *mainwin_tb_old_text = NULL; + void mainwin_lock_info_text(const gchar * text) { mainwin_info_text_locked = TRUE; - textbox_set_text(mainwin_info, text); + mainwin_tb_old_text = g_strdup(bmp_active_skin->properties.mainwin_othertext_is_status ? + mainwin_othertext->tb_text ? mainwin_info->tb_text); + textbox_set_text(bmp_active_skin->properties.mainwin_othertext_is_status ? + mainwin_othertext ? mainwin_info, text); } void mainwin_release_info_text(void) { mainwin_info_text_locked = FALSE; - mainwin_set_info_text(); + + if (mainwin_tb_old_text != NULL) + { + textbox_set_text(bmp_active_skin->properties.mainwin_othertext_is_status ? + mainwin_othertext ? mainwin_info, text); + g_free(mainwin_tb_old_text); + mainwin_tb_old_text = NULL; + } + else + mainwin_set_info_text(); /* XXX: best we can do */ }
--- a/audacious/widgets/skin.c Wed Oct 04 18:21:40 2006 -0700 +++ b/audacious/widgets/skin.c Wed Oct 04 18:48:49 2006 -0700 @@ -765,8 +765,7 @@ g_free(tmp); } - - tmp = read_ini_string(filename, "skin", "mainwinPositionX"); + tmp = read_ini_string(filename, "skin", "mainwinPositionY"); if (tmp != NULL) { @@ -774,6 +773,14 @@ g_free(tmp); } + tmp = read_ini_string(filename, "skin", "mainwinOthertextIsStatus"); + + if (tmp != NULL) + { + skin->properties.mainwin_othertext_is_status = atoi(tmp); + g_free(tmp); + } + g_free(filename); }
--- a/audacious/widgets/skin.h Wed Oct 04 18:21:40 2006 -0700 +++ b/audacious/widgets/skin.h Wed Oct 04 18:48:49 2006 -0700 @@ -110,6 +110,8 @@ gint mainwin_position_y; gboolean mainwin_menurow_visible; + + gboolean mainwin_othertext_is_status; } SkinProperties; #define SKIN_PIXMAP(x) ((SkinPixmap *)(x))