Mercurial > pidgin3 / file comparison

comparison: pidgin/gtkrequest.c

pidgin/gtkrequest.c

changeset 35527
707c3c2b2c8a
parent 35500
ae6432ea326f
child 35721
abae078d0525
child 37109
94d1a2589d5a
equal deleted inserted replaced
35526:ed1be305c985 35527:707c3c2b2c8a
560 gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0); 560 gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0);
561 gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), 561 gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
562 PIDGIN_HIG_BORDER); 562 PIDGIN_HIG_BORDER);
563 563
564 /* Setup the main horizontal box */ 564 /* Setup the main horizontal box */
565 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); 565 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
566 gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), 566 gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
567 hbox); 567 hbox);
568 568
569 /* Dialog icon. */ 569 /* Dialog icon. */
570 img = pidgin_request_dialog_icon(PURPLE_REQUEST_INPUT, cpar); 570 img = pidgin_request_dialog_icon(PURPLE_REQUEST_INPUT, cpar);
572 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); 572 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
573 573
574 pidgin_request_add_help(GTK_DIALOG(dialog), cpar); 574 pidgin_request_add_help(GTK_DIALOG(dialog), cpar);
575 575
576 /* Vertical box */ 576 /* Vertical box */
577 vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); 577 vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
578 578
579 gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0); 579 gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
580 580
581 pidgin_widget_decorate_account(hbox, purple_request_cpar_get_account(cpar)); 581 pidgin_widget_decorate_account(hbox, purple_request_cpar_get_account(cpar));
582 582
720 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); 720 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
721 gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), 721 gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
722 PIDGIN_HIG_BORDER); 722 PIDGIN_HIG_BORDER);
723 723
724 /* Setup the main horizontal box */ 724 /* Setup the main horizontal box */
725 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); 725 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
726 gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), 726 gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
727 hbox); 727 hbox);
728 728
729 /* Dialog icon. */ 729 /* Dialog icon. */
730 img = pidgin_request_dialog_icon(PURPLE_REQUEST_CHOICE, cpar); 730 img = pidgin_request_dialog_icon(PURPLE_REQUEST_CHOICE, cpar);
734 pidgin_widget_decorate_account(hbox, purple_request_cpar_get_account(cpar)); 734 pidgin_widget_decorate_account(hbox, purple_request_cpar_get_account(cpar));
735 735
736 pidgin_request_add_help(GTK_DIALOG(dialog), cpar); 736 pidgin_request_add_help(GTK_DIALOG(dialog), cpar);
737 737
738 /* Vertical box */ 738 /* Vertical box */
739 vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); 739 vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
740 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); 740 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
741 741
742 /* Descriptive label */ 742 /* Descriptive label */
743 primary_esc = pidgin_request_escape(cpar, primary); 743 primary_esc = pidgin_request_escape(cpar, primary);
744 secondary_esc = pidgin_request_escape(cpar, secondary); 744 secondary_esc = pidgin_request_escape(cpar, secondary);
757 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); 757 gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
758 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); 758 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
759 759
760 g_free(label_text); 760 g_free(label_text);
761 761
762 vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 762 vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
763 gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0); 763 gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0);
764 while ((radio_text = va_arg(args, char*))) { 764 while ((radio_text = va_arg(args, char*))) {
765 gpointer resp = va_arg(args, gpointer); 765 gpointer resp = va_arg(args, gpointer);
766 radio = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio), radio_text); 766 radio = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio), radio_text);
767 gtk_box_pack_start(GTK_BOX(vbox2), radio, FALSE, FALSE, 0); 767 gtk_box_pack_start(GTK_BOX(vbox2), radio, FALSE, FALSE, 0);
843 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); 843 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
844 gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), 844 gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
845 PIDGIN_HIG_BORDER); 845 PIDGIN_HIG_BORDER);
846 846
847 /* Setup the main horizontal box */ 847 /* Setup the main horizontal box */
848 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); 848 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
849 gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), 849 gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
850 hbox); 850 hbox);
851 851
852 img = pidgin_request_dialog_icon(PURPLE_REQUEST_ACTION, cpar); 852 img = pidgin_request_dialog_icon(PURPLE_REQUEST_ACTION, cpar);
853 gtk_misc_set_alignment(GTK_MISC(img), 0, 0); 853 gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
854 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); 854 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
855 855
856 /* Vertical box */ 856 /* Vertical box */
857 vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); 857 vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
858 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); 858 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
859 859
860 pidgin_widget_decorate_account(hbox, 860 pidgin_widget_decorate_account(hbox,
861 purple_request_cpar_get_account(cpar)); 861 purple_request_cpar_get_account(cpar));
862 862
952 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); 952 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
953 gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area( 953 gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(
954 GTK_DIALOG(dialog))), PIDGIN_HIG_BORDER); 954 GTK_DIALOG(dialog))), PIDGIN_HIG_BORDER);
955 955
956 /* Setup the main horizontal box */ 956 /* Setup the main horizontal box */
957 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); 957 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
958 gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area( 958 gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(
959 GTK_DIALOG(dialog))), hbox); 959 GTK_DIALOG(dialog))), hbox);
960 960
961 img = pidgin_request_dialog_icon(PURPLE_REQUEST_WAIT, cpar); 961 img = pidgin_request_dialog_icon(PURPLE_REQUEST_WAIT, cpar);
962 gtk_misc_set_alignment(GTK_MISC(img), 0, 0); 962 gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
966 button = pidgin_dialog_add_button(GTK_DIALOG(dialog), 966 button = pidgin_dialog_add_button(GTK_DIALOG(dialog),
967 text_to_stock(_("Cancel")), G_CALLBACK(wait_cancel_cb), data); 967 text_to_stock(_("Cancel")), G_CALLBACK(wait_cancel_cb), data);
968 gtk_widget_set_can_default(button, FALSE); 968 gtk_widget_set_can_default(button, FALSE);
969 969
970 /* Vertical box */ 970 /* Vertical box */
971 vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); 971 vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
972 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); 972 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
973 973
974 pidgin_widget_decorate_account(hbox, 974 pidgin_widget_decorate_account(hbox,
975 purple_request_cpar_get_account(cpar)); 975 purple_request_cpar_get_account(cpar));
976 976
1314 GtkWidget *box; 1314 GtkWidget *box;
1315 GtkWidget *first_radio = NULL; 1315 GtkWidget *first_radio = NULL;
1316 GtkWidget *radio; 1316 GtkWidget *radio;
1317 1317
1318 if (num_labels == 2) 1318 if (num_labels == 2)
1319 box = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 1319 box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
1320 else 1320 else
1321 box = gtk_vbox_new(FALSE, 0); 1321 box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
1322 1322
1323 widget = box; 1323 widget = box;
1324 1324
1325 gtk_widget_set_tooltip_text(widget, purple_request_field_get_tooltip(field)); 1325 gtk_widget_set_tooltip_text(widget, purple_request_field_get_tooltip(field));
1326 1326
1846 GtkHBox *main_box; 1846 GtkHBox *main_box;
1847 GtkVBox *buttons_box; 1847 GtkVBox *buttons_box;
1848 const GList *it; 1848 const GList *it;
1849 1849
1850 sheet = purple_request_field_datasheet_get_sheet(field); 1850 sheet = purple_request_field_datasheet_get_sheet(field);
1851 main_box = GTK_HBOX(gtk_hbox_new(FALSE, 0)); 1851 main_box = GTK_HBOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
1852 1852
1853 col_count = purple_request_datasheet_get_column_count(sheet); 1853 col_count = purple_request_datasheet_get_column_count(sheet);
1854 1854
1855 col_types = g_new0(GType, col_count + 1); 1855 col_types = g_new0(GType, col_count + 1);
1856 col_types[0] = G_TYPE_POINTER; 1856 col_types[0] = G_TYPE_POINTER;
1912 1912
1913 scrollable = pidgin_make_scrollable(GTK_WIDGET(view), 1913 scrollable = pidgin_make_scrollable(GTK_WIDGET(view),
1914 GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1); 1914 GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1);
1915 gtk_widget_show(GTK_WIDGET(view)); 1915 gtk_widget_show(GTK_WIDGET(view));
1916 1916
1917 buttons_box = GTK_VBOX(gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER)); 1917 buttons_box = GTK_VBOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER));
1918 gtk_size_group_add_widget(buttons_sg, GTK_WIDGET(buttons_box)); 1918 gtk_size_group_add_widget(buttons_sg, GTK_WIDGET(buttons_box));
1919 1919
1920 gtk_box_pack_start(GTK_BOX(main_box), scrollable, TRUE, TRUE, 0); 1920 gtk_box_pack_start(GTK_BOX(main_box), scrollable, TRUE, TRUE, 0);
1921 gtk_box_pack_start(GTK_BOX(main_box), GTK_WIDGET(buttons_box), 1921 gtk_box_pack_start(GTK_BOX(main_box), GTK_WIDGET(buttons_box),
1922 FALSE, FALSE, 0); 1922 FALSE, FALSE, 0);
2012 2012
2013 g_signal_connect(G_OBJECT(win), "delete_event", 2013 g_signal_connect(G_OBJECT(win), "delete_event",
2014 G_CALLBACK(destroy_multifield_cb), data); 2014 G_CALLBACK(destroy_multifield_cb), data);
2015 2015
2016 /* Setup the main horizontal box */ 2016 /* Setup the main horizontal box */
2017 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); 2017 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
2018 gtk_container_add(GTK_CONTAINER(pidgin_dialog_get_vbox(GTK_DIALOG(win))), hbox); 2018 gtk_container_add(GTK_CONTAINER(pidgin_dialog_get_vbox(GTK_DIALOG(win))), hbox);
2019 gtk_widget_show(hbox); 2019 gtk_widget_show(hbox);
2020 2020
2021 /* Dialog icon. */ 2021 /* Dialog icon. */
2022 img = pidgin_request_dialog_icon(PURPLE_REQUEST_FIELDS, cpar); 2022 img = pidgin_request_dialog_icon(PURPLE_REQUEST_FIELDS, cpar);
2053 2053
2054 pidgin_widget_decorate_account(hbox, 2054 pidgin_widget_decorate_account(hbox,
2055 purple_request_cpar_get_account(cpar)); 2055 purple_request_cpar_get_account(cpar));
2056 2056
2057 /* Setup the vbox */ 2057 /* Setup the vbox */
2058 vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); 2058 vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
2059 gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0); 2059 gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
2060 gtk_widget_show(vbox); 2060 gtk_widget_show(vbox);
2061 2061
2062 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 2062 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
2063 datasheet_buttons_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 2063 datasheet_buttons_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
2090 notebook = GTK_NOTEBOOK(gtk_notebook_new()); 2090 notebook = GTK_NOTEBOOK(gtk_notebook_new());
2091 2091
2092 pages = g_new0(GtkWidget*, tab_count); 2092 pages = g_new0(GtkWidget*, tab_count);
2093 2093
2094 for (i = 0; i < tab_count; i++) { 2094 for (i = 0; i < tab_count; i++) {
2095 pages[i] = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); 2095 pages[i] = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
2096 gtk_container_set_border_width(GTK_CONTAINER(pages[i]), PIDGIN_HIG_BORDER); 2096 gtk_container_set_border_width(GTK_CONTAINER(pages[i]), PIDGIN_HIG_BORDER);
2097 gtk_notebook_append_page(notebook, pages[i], NULL); 2097 gtk_notebook_append_page(notebook, pages[i], NULL);
2098 gtk_notebook_set_tab_label_text(notebook, pages[i], tab_names[i]); 2098 gtk_notebook_set_tab_label_text(notebook, pages[i], tab_names[i]);
2099 gtk_widget_show(pages[i]); 2099 gtk_widget_show(pages[i]);
2100 } 2100 }
2118 2118
2119 gtk_container_set_border_width( 2119 gtk_container_set_border_width(
2120 GTK_CONTAINER(pages[i]), 0); 2120 GTK_CONTAINER(pages[i]), 0);
2121 2121
2122 hbox_for_spacing = 2122 hbox_for_spacing =
2123 gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); 2123 gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
2124 gtk_box_pack_start(GTK_BOX(pages[i]), 2124 gtk_box_pack_start(GTK_BOX(pages[i]),
2125 pidgin_make_scrollable(hbox_for_spacing, 2125 pidgin_make_scrollable(hbox_for_spacing,
2126 GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, 2126 GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC,
2127 GTK_SHADOW_NONE, -1, 200), 2127 GTK_SHADOW_NONE, -1, 200),
2128 TRUE, TRUE, 0); 2128 TRUE, TRUE, 0);
2129 gtk_widget_show(hbox_for_spacing); 2129 gtk_widget_show(hbox_for_spacing);
2130 2130
2131 vbox_for_spacing = 2131 vbox_for_spacing =
2132 gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); 2132 gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
2133 gtk_box_pack_start(GTK_BOX(hbox_for_spacing), 2133 gtk_box_pack_start(GTK_BOX(hbox_for_spacing),
2134 vbox_for_spacing, TRUE, TRUE, 2134 vbox_for_spacing, TRUE, TRUE,
2135 PIDGIN_HIG_BOX_SPACE); 2135 PIDGIN_HIG_BOX_SPACE);
2136 gtk_widget_show(vbox_for_spacing); 2136 gtk_widget_show(vbox_for_spacing);
2137 2137
2138 pages[i] = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); 2138 pages[i] = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
2139 gtk_box_pack_start(GTK_BOX(vbox_for_spacing), 2139 gtk_box_pack_start(GTK_BOX(vbox_for_spacing),
2140 pages[i], TRUE, TRUE, PIDGIN_HIG_BOX_SPACE); 2140 pages[i], TRUE, TRUE, PIDGIN_HIG_BOX_SPACE);
2141 gtk_widget_show(pages[i]); 2141 gtk_widget_show(pages[i]);
2142 } 2142 }
2143 2143

Mercurial Repository: pidgin3

mercurial