Mercurial > pidgin.yaz

comparison pidgin/gtkmedia.c @ 26147:09386489e6d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change the media window items' orientations to look better.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Fri, 30 Jan 2009 07:59:37 +0000
parents 4f013819e4e3
children cd720cb4b47c
comparison
equal deleted inserted replaced
26146:4f013819e4e3 26147:09386489e6d1
184 } 184 }
185 185
186 static void 186 static void
187 pidgin_media_init (PidginMedia *media) 187 pidgin_media_init (PidginMedia *media)
188 { 188 {
189 GtkWidget *vbox; 189 GtkWidget *vbox, *hbox;
190 media->priv = PIDGIN_MEDIA_GET_PRIVATE(media); 190 media->priv = PIDGIN_MEDIA_GET_PRIVATE(media);
191 191
192 vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 192 vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
193 gtk_container_add(GTK_CONTAINER(media), vbox); 193 gtk_container_add(GTK_CONTAINER(media), vbox);
194
195 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
196 gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
197 gtk_widget_show(GTK_WIDGET(hbox));
194 198
195 media->priv->calling = gtk_label_new("Calling..."); 199 media->priv->calling = gtk_label_new("Calling...");
196 media->priv->hangup = gtk_button_new_with_mnemonic("_Hangup"); 200 media->priv->hangup = gtk_button_new_with_mnemonic("_Hangup");
197 media->priv->accept = gtk_button_new_with_mnemonic("_Accept"); 201 media->priv->accept = gtk_button_new_with_mnemonic("_Accept");
198 media->priv->reject = gtk_button_new_with_mnemonic("_Reject"); 202 media->priv->reject = gtk_button_new_with_mnemonic("_Reject");
199 media->priv->mute = gtk_toggle_button_new_with_mnemonic("_Mute"); 203 media->priv->mute = gtk_toggle_button_new_with_mnemonic("_Mute");
200 204
201 g_signal_connect(media->priv->mute, "toggled", 205 g_signal_connect(media->priv->mute, "toggled",
202 G_CALLBACK(pidgin_media_mute_toggled), media); 206 G_CALLBACK(pidgin_media_mute_toggled), media);
203 207
204 gtk_box_pack_end(GTK_BOX(vbox), media->priv->reject, FALSE, FALSE, 0); 208 gtk_box_pack_end(GTK_BOX(hbox), media->priv->reject, FALSE, FALSE, 0);
205 gtk_box_pack_end(GTK_BOX(vbox), media->priv->accept, FALSE, FALSE, 0); 209 gtk_box_pack_end(GTK_BOX(hbox), media->priv->accept, FALSE, FALSE, 0);
206 gtk_box_pack_end(GTK_BOX(vbox), media->priv->hangup, FALSE, FALSE, 0); 210 gtk_box_pack_end(GTK_BOX(hbox), media->priv->hangup, FALSE, FALSE, 0);
207 gtk_box_pack_end(GTK_BOX(vbox), media->priv->mute, FALSE, FALSE, 0); 211 gtk_box_pack_end(GTK_BOX(hbox), media->priv->mute, FALSE, FALSE, 0);
208 gtk_box_pack_end(GTK_BOX(vbox), media->priv->calling, FALSE, FALSE, 0); 212 gtk_box_pack_end(GTK_BOX(hbox), media->priv->calling, FALSE, FALSE, 0);
209 213
210 gtk_widget_show_all(media->priv->accept); 214 gtk_widget_show_all(media->priv->accept);
211 gtk_widget_show_all(media->priv->reject); 215 gtk_widget_show_all(media->priv->reject);
212 216
213 media->priv->display = gtk_vbox_new(TRUE, PIDGIN_HIG_BOX_SPACE); 217 media->priv->display = gtk_vbox_new(TRUE, PIDGIN_HIG_BOX_SPACE);
416 purple_media_get_session_type(media, sid); 420 purple_media_get_session_type(media, sid);
417 421
418 if (gtkmedia->priv->recv_widget == NULL 422 if (gtkmedia->priv->recv_widget == NULL
419 && type & (PURPLE_MEDIA_RECV_VIDEO | 423 && type & (PURPLE_MEDIA_RECV_VIDEO |
420 PURPLE_MEDIA_RECV_AUDIO)) { 424 PURPLE_MEDIA_RECV_AUDIO)) {
421 recv_widget = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 425 recv_widget = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
422 gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display), 426 gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display),
423 recv_widget, TRUE, TRUE, 0); 427 recv_widget, TRUE, TRUE, 0);
424 gtk_widget_show(recv_widget); 428 gtk_widget_show(recv_widget);
425 } else 429 } else
426 recv_widget = gtkmedia->priv->recv_widget; 430 recv_widget = gtkmedia->priv->recv_widget;
427 if (gtkmedia->priv->send_widget == NULL 431 if (gtkmedia->priv->send_widget == NULL
428 && type & (PURPLE_MEDIA_SEND_VIDEO | 432 && type & (PURPLE_MEDIA_SEND_VIDEO |
429 PURPLE_MEDIA_SEND_AUDIO)) { 433 PURPLE_MEDIA_SEND_AUDIO)) {
430 send_widget = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 434 send_widget = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
431 gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display), 435 gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display),
432 send_widget, TRUE, TRUE, 0); 436 send_widget, TRUE, TRUE, 0);
433 gtk_widget_show(send_widget); 437 gtk_widget_show(send_widget);
434 } else 438 } else
435 send_widget = gtkmedia->priv->send_widget; 439 send_widget = gtkmedia->priv->send_widget;
465 469
466 remote_video = gtk_drawing_area_new(); 470 remote_video = gtk_drawing_area_new();
467 g_signal_connect(G_OBJECT(remote_video), "realize", 471 g_signal_connect(G_OBJECT(remote_video), "realize",
468 G_CALLBACK(realize_cb), data); 472 G_CALLBACK(realize_cb), data);
469 gtk_container_add(GTK_CONTAINER(plug), remote_video); 473 gtk_container_add(GTK_CONTAINER(plug), remote_video);
470 gtk_widget_set_size_request (GTK_WIDGET(remote_video), 100, -1); 474 gtk_widget_set_size_request (GTK_WIDGET(remote_video), -1, 100);
471 gtk_widget_show(remote_video); 475 gtk_widget_show(remote_video);
472 gtk_widget_show(aspect); 476 gtk_widget_show(aspect);
473 477
474 gtkmedia->priv->remote_video = remote_video; 478 gtkmedia->priv->remote_video = remote_video;
475 } 479 }
504 508
505 local_video = gtk_drawing_area_new(); 509 local_video = gtk_drawing_area_new();
506 g_signal_connect(G_OBJECT(local_video), "realize", 510 g_signal_connect(G_OBJECT(local_video), "realize",
507 G_CALLBACK(realize_cb), data); 511 G_CALLBACK(realize_cb), data);
508 gtk_container_add(GTK_CONTAINER(plug), local_video); 512 gtk_container_add(GTK_CONTAINER(plug), local_video);
509 gtk_widget_set_size_request (GTK_WIDGET(local_video), 100, -1); 513 gtk_widget_set_size_request (GTK_WIDGET(local_video), -1, 100);
510 514
511 gtk_widget_show(local_video); 515 gtk_widget_show(local_video);
512 gtk_widget_show(aspect); 516 gtk_widget_show(aspect);
513 517
514 gtkmedia->priv->local_video = local_video; 518 gtkmedia->priv->local_video = local_video;
515 } 519 }
516 520
517 if (type & PURPLE_MEDIA_RECV_AUDIO) { 521 if (type & PURPLE_MEDIA_RECV_AUDIO) {
518 gtkmedia->priv->recv_progress = gtk_progress_bar_new(); 522 gtkmedia->priv->recv_progress = gtk_progress_bar_new();
519 gtk_widget_set_size_request(gtkmedia->priv->recv_progress, 10, 70); 523 gtk_widget_set_size_request(gtkmedia->priv->recv_progress, 70, 10);
520 gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(gtkmedia->priv->recv_progress),
521 GTK_PROGRESS_BOTTOM_TO_TOP);
522 gtk_box_pack_end(GTK_BOX(recv_widget), 524 gtk_box_pack_end(GTK_BOX(recv_widget),
523 gtkmedia->priv->recv_progress, FALSE, FALSE, 0); 525 gtkmedia->priv->recv_progress, FALSE, FALSE, 0);
524 gtk_widget_show(gtkmedia->priv->recv_progress); 526 gtk_widget_show(gtkmedia->priv->recv_progress);
525 } 527 }
526 if (type & PURPLE_MEDIA_SEND_AUDIO) { 528 if (type & PURPLE_MEDIA_SEND_AUDIO) {
527 gtkmedia->priv->send_progress = gtk_progress_bar_new(); 529 gtkmedia->priv->send_progress = gtk_progress_bar_new();
528 gtk_widget_set_size_request(gtkmedia->priv->send_progress, 10, 70); 530 gtk_widget_set_size_request(gtkmedia->priv->send_progress, 70, 10);
529 gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(gtkmedia->priv->send_progress),
530 GTK_PROGRESS_BOTTOM_TO_TOP);
531 gtk_box_pack_end(GTK_BOX(send_widget), 531 gtk_box_pack_end(GTK_BOX(send_widget),
532 gtkmedia->priv->send_progress, FALSE, FALSE, 0); 532 gtkmedia->priv->send_progress, FALSE, FALSE, 0);
533 gtk_widget_show(gtkmedia->priv->send_progress); 533 gtk_widget_show(gtkmedia->priv->send_progress);
534 534
535 gtk_widget_show(gtkmedia->priv->mute); 535 gtk_widget_show(gtkmedia->priv->mute);