src/gtkprefs.c

changeset 12573
1fc347b54974
parent 12553
52b3403a1690
child 12575
50fbef373c44
equal deleted inserted replaced
12572:a71b6aef215b 12573:1fc347b54974
1658 ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); 1658 ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
1659 gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); 1659 gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER);
1660 1660
1661 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1661 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1662 1662
1663 vbox = gaim_gtk_make_frame (ret, _("Away")); 1663 /* Idle stuff */
1664 vbox = gaim_gtk_make_frame(ret, _("Idle"));
1665
1666 gaim_gtk_prefs_dropdown(vbox, _("Idle time _reporting:"),
1667 GAIM_PREF_STRING, "/core/away/idle_reporting",
1668 _("None"), "none",
1669 _("Gaim usage"), "gaim",
1670 #ifdef USE_SCREENSAVER
1671 _("Mouse movement"), "system",
1672 #endif
1673 NULL);
1674
1675 /* Away stuff */
1676 vbox = gaim_gtk_make_frame(ret, _("Away"));
1664 1677
1665 label = gaim_gtk_prefs_dropdown(vbox, _("_Auto-reply:"), 1678 label = gaim_gtk_prefs_dropdown(vbox, _("_Auto-reply:"),
1666 GAIM_PREF_STRING, "/core/away/auto_reply", 1679 GAIM_PREF_STRING, "/core/away/auto_reply",
1667 _("Never"), "never", 1680 _("Never"), "never",
1668 _("When away"), "away", 1681 _("When away"), "away",
1669 _("When both away and idle"), "awayidle", 1682 _("When both away and idle"), "awayidle",
1670 NULL); 1683 NULL);
1671 1684
1672 button = gaim_gtk_prefs_checkbox(_("_Report idle time"), 1685 /* Auto-away stuff */
1673 "/core/away/report_idle", vbox); 1686 vbox = gaim_gtk_make_frame(ret, _("Auto-away"));
1674 1687
1675 vbox = gaim_gtk_make_frame (ret, _("Auto-away"));
1676 button = gaim_gtk_prefs_checkbox(_("Change status when _idle"), 1688 button = gaim_gtk_prefs_checkbox(_("Change status when _idle"),
1677 "/core/away/away_when_idle", vbox); 1689 "/core/away/away_when_idle", vbox);
1678 1690
1679 select = gaim_gtk_prefs_labeled_spin_button(vbox, 1691 select = gaim_gtk_prefs_labeled_spin_button(vbox,
1680 _("_Minutes before changing status:"), "/core/away/mins_before_away", 1692 _("_Minutes before changing status:"), "/core/away/mins_before_away",
1693 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); 1705 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
1694 menu = gaim_gtk_status_menu(gaim_savedstatus_get_idleaway(), G_CALLBACK(set_idle_away)); 1706 menu = gaim_gtk_status_menu(gaim_savedstatus_get_idleaway(), G_CALLBACK(set_idle_away));
1695 gtk_box_pack_start(GTK_BOX(hbox), menu, FALSE, FALSE, 0); 1707 gtk_box_pack_start(GTK_BOX(hbox), menu, FALSE, FALSE, 0);
1696 g_signal_connect(G_OBJECT(button), "clicked", 1708 g_signal_connect(G_OBJECT(button), "clicked",
1697 G_CALLBACK(gaim_gtk_toggle_sensitive), menu); 1709 G_CALLBACK(gaim_gtk_toggle_sensitive), menu);
1698
1699 /*
1700 * TODO: Need to allow users to choose a GaimSavedStatus
1701 * to use when going idle-away. Or figure out a
1702 * better UI for this. Set the preference
1703 * "/core/savedstatus/idleaway" to the name of the
1704 * GaimSavedStatus to use.
1705 *
1706 */
1707 1710
1708 if (!gaim_prefs_get_bool("/core/away/away_when_idle")) { 1711 if (!gaim_prefs_get_bool("/core/away/away_when_idle")) {
1709 gtk_widget_set_sensitive(GTK_WIDGET(menu), FALSE); 1712 gtk_widget_set_sensitive(GTK_WIDGET(menu), FALSE);
1710 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE); 1713 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
1711 gtk_widget_set_sensitive(GTK_WIDGET(label), FALSE); 1714 gtk_widget_set_sensitive(GTK_WIDGET(label), FALSE);
1887 gaim_prefs_connect_callback(prefs, "/gaim/gtk/smileys/theme", 1890 gaim_prefs_connect_callback(prefs, "/gaim/gtk/smileys/theme",
1888 smiley_theme_pref_cb, NULL); 1891 smiley_theme_pref_cb, NULL);
1889 } 1892 }
1890 1893
1891 void gaim_gtk_prefs_update_old() { 1894 void gaim_gtk_prefs_update_old() {
1892 const char *tmp;
1893 /* Rename some old prefs */ 1895 /* Rename some old prefs */
1894 gaim_prefs_rename("/gaim/gtk/logging/log_ims", "/core/logging/log_ims"); 1896 gaim_prefs_rename("/gaim/gtk/logging/log_ims", "/core/logging/log_ims");
1895 gaim_prefs_rename("/gaim/gtk/logging/log_chats", "/core/logging/log_chats"); 1897 gaim_prefs_rename("/gaim/gtk/logging/log_chats", "/core/logging/log_chats");
1896 gaim_prefs_rename("/core/conversations/placement", 1898 gaim_prefs_rename("/core/conversations/placement",
1897 "/gaim/gtk/conversations/placement"); 1899 "/gaim/gtk/conversations/placement");
1904 gaim_prefs_rename_boolean_toggle("/gaim/gtk/conversations/ignore_colors", 1906 gaim_prefs_rename_boolean_toggle("/gaim/gtk/conversations/ignore_colors",
1905 "/gaim/gtk/conversations/show_incoming_formatting"); 1907 "/gaim/gtk/conversations/show_incoming_formatting");
1906 gaim_prefs_rename_boolean_toggle("/gaim/gtk/conversations/ignore_formatting", 1908 gaim_prefs_rename_boolean_toggle("/gaim/gtk/conversations/ignore_formatting",
1907 "/gaim/gtk/conversations/show_incoming_formatting"); 1909 "/gaim/gtk/conversations/show_incoming_formatting");
1908 1910
1909 /* this string pref turned into a boolean, try to be friendly */ 1911 /* this string pref moved into the core, try to be friendly */
1910 if (gaim_prefs_exists("/gaim/gtk/idle/reporting_method")) 1912 gaim_prefs_rename("/gaim/gtk/idle/reporting_method", "/core/away/idle_reporting");
1911 {
1912 tmp = gaim_prefs_get_string("/gaim/gtk/idle/reporting_method");
1913 if (tmp != NULL && !strcmp(tmp, "none"))
1914 gaim_prefs_set_bool("/core/away/report_idle", FALSE);
1915 }
1916 1913
1917 /* Remove some no-longer-used prefs */ 1914 /* Remove some no-longer-used prefs */
1918 gaim_prefs_remove("/gaim/gtk/blist/auto_expand_contacts"); 1915 gaim_prefs_remove("/gaim/gtk/blist/auto_expand_contacts");
1919 gaim_prefs_remove("/gaim/gtk/blist/button_style"); 1916 gaim_prefs_remove("/gaim/gtk/blist/button_style");
1920 gaim_prefs_remove("/gaim/gtk/blist/grey_idle_buddies"); 1917 gaim_prefs_remove("/gaim/gtk/blist/grey_idle_buddies");

mercurial