Mercurial > pidgin3 / file comparison

comparison: pidgin/gtkprefs.c

pidgin/gtkprefs.c

branch
soc.2013.gobjectification.plugins
changeset 37109
94d1a2589d5a
parent 37108
73c5fb6d78b3
parent 35532
2c802bb77720
child 37112
37fdcf3855d3
equal deleted inserted replaced
37108:73c5fb6d78b3 37109:94d1a2589d5a
1403 const char *label_str, const char *prefs_path, 1403 const char *label_str, const char *prefs_path,
1404 const char *theme_type) 1404 const char *theme_type)
1405 { 1405 {
1406 GtkWidget *label; 1406 GtkWidget *label;
1407 GtkWidget *combo_box = NULL; 1407 GtkWidget *combo_box = NULL;
1408 GtkWidget *themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 1408 GtkWidget *themesel_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
1409 1409
1410 label = gtk_label_new(label_str); 1410 label = gtk_label_new(label_str);
1411 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 1411 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
1412 gtk_size_group_add_widget(label_sg, label); 1412 gtk_size_group_add_widget(label_sg, label);
1413 gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0); 1413 gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
1434 GtkWidget *label; 1434 GtkWidget *label;
1435 GtkWidget *combo_box; 1435 GtkWidget *combo_box;
1436 GtkWidget *themesel_hbox; 1436 GtkWidget *themesel_hbox;
1437 GtkCellRenderer *cell_rend; 1437 GtkCellRenderer *cell_rend;
1438 1438
1439 themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 1439 themesel_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
1440 gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0); 1440 gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
1441 1441
1442 label = gtk_label_new(label_str); 1442 label = gtk_label_new(label_str);
1443 gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); 1443 gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
1444 gtk_size_group_add_widget(label_sg, label); 1444 gtk_size_group_add_widget(label_sg, label);
1465 GtkWidget *label; 1465 GtkWidget *label;
1466 GtkWidget *ret, *vbox; 1466 GtkWidget *ret, *vbox;
1467 GtkSizeGroup *label_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1467 GtkSizeGroup *label_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1468 GtkSizeGroup *combo_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1468 GtkSizeGroup *combo_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1469 1469
1470 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 1470 ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE);
1471 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); 1471 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER);
1472 1472
1473 vbox = pidgin_make_frame(ret, _("Theme Selections")); 1473 vbox = pidgin_make_frame(ret, _("Theme Selections"));
1474 1474
1475 /* Instructions */ 1475 /* Instructions */
1721 GtkWidget *vbox2; 1721 GtkWidget *vbox2;
1722 GtkWidget *label; 1722 GtkWidget *label;
1723 GtkSizeGroup *sg; 1723 GtkSizeGroup *sg;
1724 GList *names = NULL; 1724 GList *names = NULL;
1725 1725
1726 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 1726 ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE);
1727 gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); 1727 gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER);
1728 1728
1729 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1729 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1730 1730
1731 /* System Tray */ 1731 /* System Tray */
1761 1761
1762 /* 1762 /*
1763 * Connect a signal to the above preference. When conversations are not 1763 * Connect a signal to the above preference. When conversations are not
1764 * shown in a tabbed window then all tabbing options should be disabled. 1764 * shown in a tabbed window then all tabbing options should be disabled.
1765 */ 1765 */
1766 vbox2 = gtk_vbox_new(FALSE, 9); 1766 vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 9);
1767 gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0); 1767 gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0);
1768 purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/conversations/tabs", 1768 purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/conversations/tabs",
1769 conversation_usetabs_cb, vbox2); 1769 conversation_usetabs_cb, vbox2);
1770 if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs")) 1770 if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs"))
1771 gtk_widget_set_sensitive(vbox2, FALSE); 1771 gtk_widget_set_sensitive(vbox2, FALSE);
1838 GtkWidget *frame; 1838 GtkWidget *frame;
1839 GtkWidget *hbox; 1839 GtkWidget *hbox;
1840 GtkWidget *checkbox; 1840 GtkWidget *checkbox;
1841 GtkWidget *spin_button; 1841 GtkWidget *spin_button;
1842 1842
1843 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 1843 ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE);
1844 gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); 1844 gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER);
1845 1845
1846 vbox = pidgin_make_frame(ret, _("Conversations")); 1846 vbox = pidgin_make_frame(ret, _("Conversations"));
1847 1847
1848 pidgin_prefs_dropdown(vbox, _("Chat notification:"), 1848 pidgin_prefs_dropdown(vbox, _("Chat notification:"),
1874 pidgin_prefs_checkbox(_("Use smooth-scrolling"), PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling", vbox); 1874 pidgin_prefs_checkbox(_("Use smooth-scrolling"), PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling", vbox);
1875 1875
1876 #ifdef _WIN32 1876 #ifdef _WIN32
1877 pidgin_prefs_checkbox(_("F_lash window when IMs are received"), PIDGIN_PREFS_ROOT "/win32/blink_im", vbox); 1877 pidgin_prefs_checkbox(_("F_lash window when IMs are received"), PIDGIN_PREFS_ROOT "/win32/blink_im", vbox);
1878 #endif 1878 #endif
1879 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 1879 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
1880 1880
1881 checkbox = pidgin_prefs_checkbox(_("Resize incoming custom smileys"), 1881 checkbox = pidgin_prefs_checkbox(_("Resize incoming custom smileys"),
1882 PIDGIN_PREFS_ROOT "/conversations/resize_custom_smileys", hbox); 1882 PIDGIN_PREFS_ROOT "/conversations/resize_custom_smileys", hbox);
1883 1883
1884 spin_button = pidgin_prefs_labeled_spin_button(hbox, 1884 spin_button = pidgin_prefs_labeled_spin_button(hbox,
2151 "background-image: none;" 2151 "background-image: none;"
2152 "background-color: @success_color;" 2152 "background-color: @success_color;"
2153 "}"; 2153 "}";
2154 #endif 2154 #endif
2155 2155
2156 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 2156 ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE);
2157 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); 2157 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER);
2158 2158
2159 vbox = pidgin_make_frame (ret, _("IP Address")); 2159 vbox = pidgin_make_frame (ret, _("IP Address"));
2160 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 2160 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
2161 2161
2167 gtk_widget_show(entry); 2167 gtk_widget_show(entry);
2168 2168
2169 pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("ST_UN server:"), 2169 pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("ST_UN server:"),
2170 sg, entry, TRUE, NULL); 2170 sg, entry, TRUE, NULL);
2171 2171
2172 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 2172 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
2173 gtk_container_add(GTK_CONTAINER(vbox), hbox); 2173 gtk_container_add(GTK_CONTAINER(vbox), hbox);
2174 2174
2175 label = gtk_label_new(NULL); 2175 label = gtk_label_new(NULL);
2176 gtk_container_add(GTK_CONTAINER(hbox), label); 2176 gtk_container_add(GTK_CONTAINER(hbox), label);
2177 gtk_size_group_add_widget(sg, label); 2177 gtk_size_group_add_widget(sg, label);
2218 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 2218 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
2219 2219
2220 pidgin_prefs_checkbox(_("_Enable automatic router port forwarding"), 2220 pidgin_prefs_checkbox(_("_Enable automatic router port forwarding"),
2221 "/purple/network/map_ports", vbox); 2221 "/purple/network/map_ports", vbox);
2222 2222
2223 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 2223 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
2224 2224
2225 ports_checkbox = pidgin_prefs_checkbox(_("_Manually specify range of ports to listen on:"), 2225 ports_checkbox = pidgin_prefs_checkbox(_("_Manually specify range of ports to listen on:"),
2226 "/purple/network/ports_range_use", hbox); 2226 "/purple/network/ports_range_use", hbox);
2227 2227
2228 spin_button = pidgin_prefs_labeled_spin_button(hbox, _("_Start:"), 2228 spin_button = pidgin_prefs_labeled_spin_button(hbox, _("_Start:"),
2372 { 2372 {
2373 GtkWidget *ret, *vbox, *hbox, *label, *entry, *browser_button; 2373 GtkWidget *ret, *vbox, *hbox, *label, *entry, *browser_button;
2374 GtkSizeGroup *sg; 2374 GtkSizeGroup *sg;
2375 GList *browsers = NULL; 2375 GList *browsers = NULL;
2376 2376
2377 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 2377 ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE);
2378 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); 2378 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER);
2379 2379
2380 vbox = pidgin_make_frame (ret, _("Browser Selection")); 2380 vbox = pidgin_make_frame (ret, _("Browser Selection"));
2381 2381
2382 if (purple_running_gnome()) { 2382 if (purple_running_gnome()) {
2383 gchar *path; 2383 gchar *path;
2384 2384
2385 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 2385 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
2386 label = gtk_label_new(_("Browser preferences are configured in GNOME preferences")); 2386 label = gtk_label_new(_("Browser preferences are configured in GNOME preferences"));
2387 gtk_container_add(GTK_CONTAINER(vbox), hbox); 2387 gtk_container_add(GTK_CONTAINER(vbox), hbox);
2388 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); 2388 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
2389 2389
2390 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 2390 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
2391 gtk_container_add(GTK_CONTAINER(vbox), hbox); 2391 gtk_container_add(GTK_CONTAINER(vbox), hbox);
2392 2392
2393 path = g_find_program_in_path("gnome-control-center"); 2393 path = g_find_program_in_path("gnome-control-center");
2394 if (path != NULL) { 2394 if (path != NULL) {
2395 gchar *tmp = g_strdup_printf("%s info", path); 2395 gchar *tmp = g_strdup_printf("%s info", path);
2423 browsers); 2423 browsers);
2424 g_list_free(browsers); 2424 g_list_free(browsers);
2425 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 2425 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
2426 gtk_size_group_add_widget(sg, label); 2426 gtk_size_group_add_widget(sg, label);
2427 2427
2428 hbox = gtk_hbox_new(FALSE, 0); 2428 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
2429 label = pidgin_prefs_dropdown(hbox, _("_Open link in:"), PURPLE_PREF_INT, 2429 label = pidgin_prefs_dropdown(hbox, _("_Open link in:"), PURPLE_PREF_INT,
2430 PIDGIN_PREFS_ROOT "/browsers/place", 2430 PIDGIN_PREFS_ROOT "/browsers/place",
2431 _("Browser default"), PIDGIN_BROWSER_DEFAULT, 2431 _("Browser default"), PIDGIN_BROWSER_DEFAULT,
2432 _("New window"), PIDGIN_BROWSER_NEW_WINDOW, 2432 _("New window"), PIDGIN_BROWSER_NEW_WINDOW,
2433 _("New tab"), PIDGIN_BROWSER_NEW_TAB, 2433 _("New tab"), PIDGIN_BROWSER_NEW_TAB,
2467 GtkWidget *ret = NULL, *vbox = NULL, *hbox = NULL; 2467 GtkWidget *ret = NULL, *vbox = NULL, *hbox = NULL;
2468 GtkWidget *table = NULL, *entry = NULL, *label = NULL, *proxy_button = NULL; 2468 GtkWidget *table = NULL, *entry = NULL, *label = NULL, *proxy_button = NULL;
2469 GtkWidget *prefs_proxy_frame = NULL; 2469 GtkWidget *prefs_proxy_frame = NULL;
2470 PurpleProxyInfo *proxy_info; 2470 PurpleProxyInfo *proxy_info;
2471 2471
2472 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 2472 ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE);
2473 gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); 2473 gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER);
2474 vbox = pidgin_make_frame(ret, _("Proxy Server")); 2474 vbox = pidgin_make_frame(ret, _("Proxy Server"));
2475 prefs_proxy_frame = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 2475 prefs_proxy_frame = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
2476 2476
2477 if(purple_running_gnome()) { 2477 if(purple_running_gnome()) {
2478 gchar *path = NULL; 2478 gchar *path = NULL;
2479 2479
2480 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 2480 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
2481 label = gtk_label_new(_("Proxy preferences are configured in GNOME preferences")); 2481 label = gtk_label_new(_("Proxy preferences are configured in GNOME preferences"));
2482 gtk_container_add(GTK_CONTAINER(vbox), hbox); 2482 gtk_container_add(GTK_CONTAINER(vbox), hbox);
2483 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); 2483 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
2484 2484
2485 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 2485 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
2486 gtk_container_add(GTK_CONTAINER(vbox), hbox); 2486 gtk_container_add(GTK_CONTAINER(vbox), hbox);
2487 2487
2488 path = g_find_program_in_path("gnome-network-properties"); 2488 path = g_find_program_in_path("gnome-network-properties");
2489 if (path == NULL) 2489 if (path == NULL)
2490 path = g_find_program_in_path("gnome-network-preferences"); 2490 path = g_find_program_in_path("gnome-network-preferences");
2512 2512
2513 /* NOTE: path leaks, but only when the prefs window is destroyed, 2513 /* NOTE: path leaks, but only when the prefs window is destroyed,
2514 which is never */ 2514 which is never */
2515 gtk_widget_show_all(ret); 2515 gtk_widget_show_all(ret);
2516 } else { 2516 } else {
2517 GtkWidget *prefs_proxy_subframe = gtk_vbox_new(FALSE, 0); 2517 GtkWidget *prefs_proxy_subframe = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
2518 2518
2519 /* This is a global option that affects SOCKS4 usage even with 2519 /* This is a global option that affects SOCKS4 usage even with
2520 * account-specific proxy settings */ 2520 * account-specific proxy settings */
2521 pidgin_prefs_checkbox(_("Use remote _DNS with SOCKS4 proxies"), 2521 pidgin_prefs_checkbox(_("Use remote _DNS with SOCKS4 proxies"),
2522 "/purple/proxy/socks4_remotedns", prefs_proxy_frame); 2522 "/purple/proxy/socks4_remotedns", prefs_proxy_frame);
2557 2557
2558 if (proxy_info != NULL && purple_proxy_info_get_host(proxy_info)) 2558 if (proxy_info != NULL && purple_proxy_info_get_host(proxy_info))
2559 gtk_entry_set_text(GTK_ENTRY(entry), 2559 gtk_entry_set_text(GTK_ENTRY(entry),
2560 purple_proxy_info_get_host(proxy_info)); 2560 purple_proxy_info_get_host(proxy_info));
2561 2561
2562 hbox = gtk_hbox_new(TRUE, 5); 2562 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
2563 gtk_box_set_homogeneous(GTK_BOX(hbox), TRUE);
2563 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 2564 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
2564 pidgin_set_accessible_label (entry, label); 2565 pidgin_set_accessible_label (entry, label);
2565 2566
2566 label = gtk_label_new_with_mnemonic(_("P_ort:")); 2567 label = gtk_label_new_with_mnemonic(_("P_ort:"));
2567 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); 2568 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
2591 2592
2592 if (proxy_info != NULL && purple_proxy_info_get_username(proxy_info) != NULL) 2593 if (proxy_info != NULL && purple_proxy_info_get_username(proxy_info) != NULL)
2593 gtk_entry_set_text(GTK_ENTRY(entry), 2594 gtk_entry_set_text(GTK_ENTRY(entry),
2594 purple_proxy_info_get_username(proxy_info)); 2595 purple_proxy_info_get_username(proxy_info));
2595 2596
2596 hbox = gtk_hbox_new(TRUE, 5); 2597 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
2598 gtk_box_set_homogeneous(GTK_BOX(hbox), TRUE);
2597 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 2599 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
2598 pidgin_set_accessible_label (entry, label); 2600 pidgin_set_accessible_label (entry, label);
2599 2601
2600 label = gtk_label_new_with_mnemonic(_("Pa_ssword:")); 2602 label = gtk_label_new_with_mnemonic(_("Pa_ssword:"));
2601 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); 2603 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
2627 { 2629 {
2628 GtkWidget *ret; 2630 GtkWidget *ret;
2629 GtkWidget *vbox; 2631 GtkWidget *vbox;
2630 GList *names; 2632 GList *names;
2631 2633
2632 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 2634 ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE);
2633 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); 2635 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER);
2634 2636
2635 2637
2636 vbox = pidgin_make_frame (ret, _("Logging")); 2638 vbox = pidgin_make_frame (ret, _("Logging"));
2637 names = purple_log_logger_get_options(); 2639 names = purple_log_logger_get_options();
2883 PidginPrefValue initial; 2885 PidginPrefValue initial;
2884 2886
2885 g_return_val_if_fail(keyring_page_instance == NULL, 2887 g_return_val_if_fail(keyring_page_instance == NULL,
2886 keyring_page_instance); 2888 keyring_page_instance);
2887 2889
2888 keyring_page_instance = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 2890 keyring_page_instance = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE);
2889 gtk_container_set_border_width(GTK_CONTAINER(keyring_page_instance), 2891 gtk_container_set_border_width(GTK_CONTAINER(keyring_page_instance),
2890 PIDGIN_HIG_BORDER); 2892 PIDGIN_HIG_BORDER);
2891 2893
2892 /* Keyring selection */ 2894 /* Keyring selection */
2893 keyring_vbox = GTK_BOX(pidgin_make_frame(keyring_page_instance, 2895 keyring_vbox = GTK_BOX(pidgin_make_frame(keyring_page_instance,
3159 char *pref; 3161 char *pref;
3160 GtkWidget *dd; 3162 GtkWidget *dd;
3161 GtkWidget *entry; 3163 GtkWidget *entry;
3162 const char *cmd; 3164 const char *cmd;
3163 3165
3164 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 3166 ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE);
3165 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); 3167 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER);
3166 3168
3167 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 3169 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
3168 3170
3169 vbox2 = pidgin_make_frame(ret, _("Sound Options")); 3171 vbox2 = pidgin_make_frame(ret, _("Sound Options"));
3170 3172
3171 vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 3173 vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
3172 gtk_box_pack_start(GTK_BOX(vbox2), vbox, FALSE, FALSE, 0); 3174 gtk_box_pack_start(GTK_BOX(vbox2), vbox, FALSE, FALSE, 0);
3173 3175
3174 dd = pidgin_prefs_dropdown(vbox2, _("_Method:"), PURPLE_PREF_STRING, 3176 dd = pidgin_prefs_dropdown(vbox2, _("_Method:"), PURPLE_PREF_STRING,
3175 PIDGIN_PREFS_ROOT "/sound/method", 3177 PIDGIN_PREFS_ROOT "/sound/method",
3176 _("Automatic"), "automatic", 3178 _("Automatic"), "automatic",
3220 _("Only when not available"), 2, 3222 _("Only when not available"), 2,
3221 _("Always"), 3, 3223 _("Always"), 3,
3222 NULL); 3224 NULL);
3223 3225
3224 #ifdef USE_GSTREAMER 3226 #ifdef USE_GSTREAMER
3225 sw = gtk_hscale_new_with_range(0.0, 100.0, 5.0); 3227 sw = gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,
3228 0.0, 100.0, 5.0);
3226 gtk_range_set_increments(GTK_RANGE(sw), 5.0, 25.0); 3229 gtk_range_set_increments(GTK_RANGE(sw), 5.0, 25.0);
3227 gtk_range_set_value(GTK_RANGE(sw), purple_prefs_get_int(PIDGIN_PREFS_ROOT "/sound/volume")); 3230 gtk_range_set_value(GTK_RANGE(sw), purple_prefs_get_int(PIDGIN_PREFS_ROOT "/sound/volume"));
3228 g_signal_connect (G_OBJECT (sw), "format-value", 3231 g_signal_connect (G_OBJECT (sw), "format-value",
3229 G_CALLBACK (prefs_sound_volume_format), 3232 G_CALLBACK (prefs_sound_volume_format),
3230 NULL); 3233 NULL);
3308 g_object_unref(G_OBJECT(event_store)); 3311 g_object_unref(G_OBJECT(event_store));
3309 gtk_box_pack_start(GTK_BOX(vbox), 3312 gtk_box_pack_start(GTK_BOX(vbox),
3310 pidgin_make_scrollable(event_view, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, GTK_SHADOW_IN, -1, 100), 3313 pidgin_make_scrollable(event_view, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, GTK_SHADOW_IN, -1, 100),
3311 TRUE, TRUE, 0); 3314 TRUE, TRUE, 0);
3312 3315
3313 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 3316 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
3314 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 3317 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
3315 sound_entry = gtk_entry_new(); 3318 sound_entry = gtk_entry_new();
3316 pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s", 3319 pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s",
3317 pidgin_sound_get_event_option(0)); 3320 pidgin_sound_get_event_option(0));
3318 file = purple_prefs_get_path(pref); 3321 file = purple_prefs_get_path(pref);
3362 GtkWidget *label; 3365 GtkWidget *label;
3363 GtkWidget *button; 3366 GtkWidget *button;
3364 GtkWidget *menu; 3367 GtkWidget *menu;
3365 GtkSizeGroup *sg; 3368 GtkSizeGroup *sg;
3366 3369
3367 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 3370 ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE);
3368 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); 3371 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER);
3369 3372
3370 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 3373 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
3371 3374
3372 /* Idle stuff */ 3375 /* Idle stuff */
3385 3388
3386 pidgin_prefs_labeled_spin_button(vbox, 3389 pidgin_prefs_labeled_spin_button(vbox,
3387 _("_Minutes before becoming idle:"), "/purple/away/mins_before_away", 3390 _("_Minutes before becoming idle:"), "/purple/away/mins_before_away",
3388 1, 24 * 60, sg); 3391 1, 24 * 60, sg);
3389 3392
3390 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 3393 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
3391 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 3394 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
3392 3395
3393 button = pidgin_prefs_checkbox(_("Change to this status when _idle:"), 3396 button = pidgin_prefs_checkbox(_("Change to this status when _idle:"),
3394 "/purple/away/away_when_idle", hbox); 3397 "/purple/away/away_when_idle", hbox);
3395 gtk_size_group_add_widget(sg, button); 3398 gtk_size_group_add_widget(sg, button);
3876 char *tmp; 3879 char *tmp;
3877 3880
3878 label = gtk_label_new(NULL); 3881 label = gtk_label_new(NULL);
3879 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); 3882 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
3880 3883
3881 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 3884 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_CAT_SPACE);
3882 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 3885 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
3883 label = gtk_label_new(_("Volume:")); 3886 label = gtk_label_new(_("Volume:"));
3884 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); 3887 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
3885 volume = gtk_volume_button_new(); 3888 volume = gtk_volume_button_new();
3886 gtk_box_pack_start(GTK_BOX(hbox), volume, TRUE, TRUE, 0); 3889 gtk_box_pack_start(GTK_BOX(hbox), volume, TRUE, TRUE, 0);
3893 purple_prefs_get_int("/purple/media/audio/silence_threshold")); 3896 purple_prefs_get_int("/purple/media/audio/silence_threshold"));
3894 label = gtk_label_new(tmp); 3897 label = gtk_label_new(tmp);
3895 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); 3898 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
3896 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); 3899 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
3897 g_free(tmp); 3900 g_free(tmp);
3898 threshold = gtk_hscale_new_with_range(0, 100, 1); 3901 threshold = gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,
3902 0, 100, 1);
3899 gtk_box_pack_start(GTK_BOX(vbox), threshold, FALSE, FALSE, 0); 3903 gtk_box_pack_start(GTK_BOX(vbox), threshold, FALSE, FALSE, 0);
3900 gtk_range_set_value(GTK_RANGE(threshold), 3904 gtk_range_set_value(GTK_RANGE(threshold),
3901 purple_prefs_get_int("/purple/media/audio/silence_threshold")); 3905 purple_prefs_get_int("/purple/media/audio/silence_threshold"));
3902 gtk_scale_set_draw_value(GTK_SCALE(threshold), FALSE); 3906 gtk_scale_set_draw_value(GTK_SCALE(threshold), FALSE);
3903 g_signal_connect(threshold, "value-changed", 3907 g_signal_connect(threshold, "value-changed",
4068 { 4072 {
4069 GtkWidget *ret; 4073 GtkWidget *ret;
4070 GtkWidget *vbox; 4074 GtkWidget *vbox;
4071 GtkSizeGroup *sg; 4075 GtkSizeGroup *sg;
4072 4076
4073 ret = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 4077 ret = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_CAT_SPACE);
4074 gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); 4078 gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER);
4075 4079
4076 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 4080 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
4077 4081
4078 vbox = pidgin_make_frame(ret, _("Audio")); 4082 vbox = pidgin_make_frame(ret, _("Audio"));

Mercurial Repository: pidgin3

mercurial