From: <lsc...@us...> - 2006-10-26 02:42:49
|
Revision: 17585 http://svn.sourceforge.net/gaim/?rev=17585&view=rev Author: lschiere Date: 2006-10-25 19:42:42 -0700 (Wed, 25 Oct 2006) Log Message: ----------- I'd like to try this. I think it will help people find these prefs, and match them to the new functionality we've introduced. Modified Paths: -------------- trunk/gtk/gtkprefs.c Modified: trunk/gtk/gtkprefs.c =================================================================== --- trunk/gtk/gtkprefs.c 2006-10-25 15:53:06 UTC (rev 17584) +++ trunk/gtk/gtkprefs.c 2006-10-26 02:42:42 UTC (rev 17585) @@ -1897,7 +1897,7 @@ } #endif prefs_notebook_add_page(_("Logging"), NULL, logging_page(), &p, NULL, notebook_page++); - prefs_notebook_add_page(_("Away / Idle"), NULL, away_page(), &p, NULL, notebook_page++); + prefs_notebook_add_page(_("State / Idle"), NULL, away_page(), &p, NULL, notebook_page++); } void gaim_gtk_prefs_show(void) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-10-28 20:13:41
|
Revision: 17610 http://svn.sourceforge.net/gaim/?rev=17610&view=rev Author: thekingant Date: 2006-10-28 13:11:46 -0700 (Sat, 28 Oct 2006) Log Message: ----------- I agree with Kevin, I think "Status / Idle" is better than "State / Idle." But for the record I prefer "Away / Idle." I think people will be looking for away-related preferences more than anything else, and "status" is one of those words that I would glance at and assume it wasn't what I wanted. Modified Paths: -------------- trunk/gtk/gtkprefs.c Modified: trunk/gtk/gtkprefs.c =================================================================== --- trunk/gtk/gtkprefs.c 2006-10-28 20:10:08 UTC (rev 17609) +++ trunk/gtk/gtkprefs.c 2006-10-28 20:11:46 UTC (rev 17610) @@ -1897,7 +1897,7 @@ } #endif prefs_notebook_add_page(_("Logging"), NULL, logging_page(), &p, NULL, notebook_page++); - prefs_notebook_add_page(_("State / Idle"), NULL, away_page(), &p, NULL, notebook_page++); + prefs_notebook_add_page(_("Status / Idle"), NULL, away_page(), &p, NULL, notebook_page++); } void gaim_gtk_prefs_show(void) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sea...@us...> - 2006-11-02 21:24:50
|
Revision: 17655 http://svn.sourceforge.net/gaim/?rev=17655&view=rev Author: seanegan Date: 2006-11-02 13:24:46 -0800 (Thu, 02 Nov 2006) Log Message: ----------- Sizegroup those mofos. Modified Paths: -------------- trunk/gtk/gtkprefs.c Modified: trunk/gtk/gtkprefs.c =================================================================== --- trunk/gtk/gtkprefs.c 2006-11-02 21:09:12 UTC (rev 17654) +++ trunk/gtk/gtkprefs.c 2006-11-02 21:24:46 UTC (rev 17655) @@ -805,10 +805,13 @@ GtkWidget *vbox; GtkWidget *vbox2; GtkWidget *label; + GtkSizeGroup *sg; GList *names = NULL; ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER); + + sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); vbox = gaim_gtk_make_frame(ret, _("System Tray Icon")); label = gaim_gtk_prefs_dropdown(vbox, _("_Show System Tray Icon:"), GAIM_PREF_STRING, @@ -817,16 +820,20 @@ _("Never"), "never", _("On unread messages"), "pending", NULL); - + gtk_size_group_add_widget(sg, label); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + vbox = gaim_gtk_make_frame(ret, _("Conversation Window Hiding")); - gaim_gtk_prefs_dropdown(vbox, _("_Hide new IM conversations"), - GAIM_PREF_STRING, "/gaim/gtk/conversations/im/hide_new", - _("Never"), "never", - _("When away"), "away", - _("Always"), "always", - NULL); + label = gaim_gtk_prefs_dropdown(vbox, _("_Hide new IM conversations"), + GAIM_PREF_STRING, "/gaim/gtk/conversations/im/hide_new", + _("Never"), "never", + _("When away"), "away", + _("Always"), "always", + NULL); + gtk_size_group_add_widget(sg, label); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + - /* All the tab options! */ vbox = gaim_gtk_make_frame(ret, _("Tab Options")); @@ -858,10 +865,16 @@ _("Right Vertical"), GTK_POS_RIGHT|8, #endif NULL); - + gtk_size_group_add_widget(sg, label); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + names = gaim_gtkconv_placement_get_options(); label = gaim_gtk_prefs_dropdown_from_list(vbox2, _("N_ew conversations:"), - GAIM_PREF_STRING, "/gaim/gtk/conversations/placement", names); + GAIM_PREF_STRING, "/gaim/gtk/conversations/placement", names); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + + gtk_size_group_add_widget(sg, label); + g_list_free(names); gtk_widget_show_all(ret); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sea...@us...> - 2006-11-02 21:40:19
|
Revision: 17656 http://svn.sourceforge.net/gaim/?rev=17656&view=rev Author: seanegan Date: 2006-11-02 13:40:11 -0800 (Thu, 02 Nov 2006) Log Message: ----------- SimGuy: seanegan: Hide new IM conversations is currently in botht he Conversations and Interface tab Modified Paths: -------------- trunk/gtk/gtkprefs.c Modified: trunk/gtk/gtkprefs.c =================================================================== --- trunk/gtk/gtkprefs.c 2006-11-02 21:24:46 UTC (rev 17655) +++ trunk/gtk/gtkprefs.c 2006-11-02 21:40:11 UTC (rev 17656) @@ -897,13 +897,6 @@ vbox = gaim_gtk_make_frame(ret, _("Conversations")); - gaim_gtk_prefs_dropdown(vbox, _("_Hide new IM conversations"), - GAIM_PREF_STRING, "/gaim/gtk/conversations/im/hide_new", - _("Never"), "never", - _("When away"), "away", - _("Always"), "always", - NULL); - gaim_gtk_prefs_checkbox(_("Show _formatting on incoming messages"), "/gaim/gtk/conversations/show_incoming_formatting", vbox); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-11-03 03:13:46
|
Revision: 17660 http://svn.sourceforge.net/gaim/?rev=17660&view=rev Author: rlaager Date: 2006-11-02 19:13:26 -0800 (Thu, 02 Nov 2006) Log Message: ----------- * Add a label for Default Formatting, so the imhtml doesn't look so out of place. * Modify a few things for consistency. Modified Paths: -------------- trunk/gtk/gtkprefs.c Modified: trunk/gtk/gtkprefs.c =================================================================== --- trunk/gtk/gtkprefs.c 2006-11-03 02:30:50 UTC (rev 17659) +++ trunk/gtk/gtkprefs.c 2006-11-03 03:13:26 UTC (rev 17660) @@ -632,7 +632,7 @@ GtkWidget *label; GtkTargetEntry te[3] = {{"text/plain", 0, 0},{"text/uri-list", 0, 1},{"STRING", 0, 2}}; - ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); label = gtk_label_new(_("Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list.")); @@ -808,13 +808,13 @@ GtkSizeGroup *sg; GList *names = NULL; - ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER); sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); vbox = gaim_gtk_make_frame(ret, _("System Tray Icon")); - label = gaim_gtk_prefs_dropdown(vbox, _("_Show System Tray Icon:"), GAIM_PREF_STRING, + label = gaim_gtk_prefs_dropdown(vbox, _("_Show system tray icon:"), GAIM_PREF_STRING, "/gaim/gtk/docklet/show", _("Always"), "always", _("Never"), "never", @@ -824,7 +824,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); vbox = gaim_gtk_make_frame(ret, _("Conversation Window Hiding")); - label = gaim_gtk_prefs_dropdown(vbox, _("_Hide new IM conversations"), + label = gaim_gtk_prefs_dropdown(vbox, _("_Hide new IM conversations:"), GAIM_PREF_STRING, "/gaim/gtk/conversations/im/hide_new", _("Never"), "never", _("When away"), "away", @@ -835,7 +835,7 @@ /* All the tab options! */ - vbox = gaim_gtk_make_frame(ret, _("Tab Options")); + vbox = gaim_gtk_make_frame(ret, _("Tabs")); gaim_gtk_prefs_checkbox(_("Show IMs and chats in _tabbed windows"), "/gaim/gtk/conversations/tabs", vbox); @@ -892,7 +892,7 @@ GtkWidget *imhtml; GtkWidget *frame; - ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER); vbox = gaim_gtk_make_frame(ret, _("Conversations")); @@ -922,6 +922,8 @@ gaim_gtk_prefs_checkbox(_("F_lash window when IMs are received"), "/gaim/gtk/win32/blink_im", vbox); #endif + vbox = gaim_gtk_make_frame(ret, _("Default Formatting")); + frame = gaim_gtk_create_imhtml(TRUE, &imhtml, &toolbar, NULL); gtk_widget_set_name(imhtml, "gaim_gtkprefs_font_imhtml"); gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE); @@ -1002,7 +1004,7 @@ GtkSizeGroup *sg; GaimProxyInfo *proxy_info = NULL; - ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); + ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); vbox = gaim_gtk_make_frame (ret, _("IP Address")); @@ -1343,6 +1345,7 @@ ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); + vbox = gaim_gtk_make_frame (ret, _("Logging")); names = gaim_log_logger_get_options(); @@ -1761,6 +1764,7 @@ button = gtk_button_new_with_label(_("Choose...")); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(select_sound), NULL); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1); + gtk_widget_show_all(ret); return ret; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Kevin M S. <ke...@si...> - 2006-10-26 03:37:33
Attachments:
signature.asc
|
lsc...@us... wrote: > Revision: 17585 > http://svn.sourceforge.net/gaim/?rev=3D17585&view=3Drev > Author: lschiere > Date: 2006-10-25 19:42:42 -0700 (Wed, 25 Oct 2006) >=20 > Log Message: > ----------- > I'd like to try this. I think it will help people find these prefs, an= d match them to the new functionality we've introduced. >=20 > Modified Paths: > -------------- > trunk/gtk/gtkprefs.c >=20 > Modified: trunk/gtk/gtkprefs.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- trunk/gtk/gtkprefs.c 2006-10-25 15:53:06 UTC (rev 17584) > +++ trunk/gtk/gtkprefs.c 2006-10-26 02:42:42 UTC (rev 17585) > @@ -1897,7 +1897,7 @@ > } > #endif > prefs_notebook_add_page(_("Logging"), NULL, logging_page(), &p, NULL,= notebook_page++); > - prefs_notebook_add_page(_("Away / Idle"), NULL, away_page(), &p, NULL= , notebook_page++); > + prefs_notebook_add_page(_("State / Idle"), NULL, away_page(), &p, NUL= L, notebook_page++); > } > =20 > void gaim_gtk_prefs_show(void) >=20 >=20 Wouldn't it be better to use the term "Status" that we're using to refer to the redesigned system? Kevin |