"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/xitk/xine-toolkit/dialog.c" between
xine-ui-0.99.13.tar.bz2 and xine-ui-0.99.14.tar.bz2

About: xine is a free video player which plays mpeg-2 and mpeg-1 video, DVDs (unlocked/unencrypted only), video CDs, SVCDs, and AVI files (using Win32 codecs) with synchronized audio and video, and optionally fullscreen using the Xv extensions in Xfree86 4.x (user interface).

dialog.c  (xine-ui-0.99.13.tar.bz2):dialog.c  (xine-ui-0.99.14.tar.bz2)
/* /*
* Copyright (C) 2000-2021 the xine project * Copyright (C) 2000-2022 the xine project
* *
* This file is part of xine, a unix video player. * This file is part of xine, a unix video player.
* *
* xine is free software; you can redistribute it and/or modify * xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* xine is distributed in the hope that it will be useful, * xine is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 222 skipping to change at line 222
return 0; return 0;
} }
wd->type = 33; wd->type = 33;
if (check_label) { if (check_label) {
xitk_widget_list_t *widget_list = xitk_window_widget_list (wd->xwin); xitk_widget_list_t *widget_list = xitk_window_widget_list (wd->xwin);
int x = 25, y = winh - (num_buttons ? 50 : 0) - 50; int x = 25, y = winh - (num_buttons ? 50 : 0) - 50;
xitk_button_widget_t b; xitk_button_widget_t b;
xitk_label_widget_t lbl; xitk_label_widget_t lbl;
XITK_WIDGET_INIT (&b); b.nw.wl = widget_list;
XITK_WIDGET_INIT(&lbl); b.nw.skin_element_name = "XITK_NOSKIN_CHECK";
b.nw.userdata = NULL;
b.skin_element_name = "XITK_NOSKIN_CHECK";
b.callback = NULL; b.callback = NULL;
b.state_callback = _dialog_dummy; b.state_callback = _dialog_dummy;
b.userdata = NULL; wd->w[_W_checkbox] = xitk_noskin_button_create (&b, x, y + 5, 10, 10);
wd->w[_W_checkbox] = xitk_noskin_button_create (widget_list, &b, x, y + 5, 1
0, 10);
if (wd->w[_W_checkbox]) { if (wd->w[_W_checkbox]) {
xitk_dlist_add_tail (&widget_list->list, &wd->w[_W_checkbox]->node); xitk_dlist_add_tail (&widget_list->list, &wd->w[_W_checkbox]->node);
xitk_button_set_state (wd->w[_W_checkbox], checked); xitk_button_set_state (wd->w[_W_checkbox], checked);
} }
lbl.skin_element_name = NULL; lbl.nw.wl = widget_list;
lbl.label = check_label; lbl.nw.skin_element_name = NULL;
lbl.callback = NULL; lbl.nw.userdata = NULL;
lbl.userdata = NULL; lbl.label = check_label;
wd->w[_W_checkbox_label] = xitk_noskin_label_create (widget_list, &lbl, x + lbl.callback = NULL;
15, y, winw - x - 40, 20, DEFAULT_FONT_12); wd->w[_W_checkbox_label] = xitk_noskin_label_create (&lbl, x + 15, y, winw -
x - 40, 20, DEFAULT_FONT_12);
if (wd->w[_W_checkbox_label]) if (wd->w[_W_checkbox_label])
xitk_dlist_add_tail (&widget_list->list, &wd->w[_W_checkbox_label]->node); xitk_dlist_add_tail (&widget_list->list, &wd->w[_W_checkbox_label]->node);
xitk_widget_set_focus_redirect (wd->w[_W_checkbox_label], wd->w[_W_checkbox] ); xitk_widget_set_focus_redirect (wd->w[_W_checkbox_label], wd->w[_W_checkbox] );
} }
wd->done3cb = done_cb; wd->done3cb = done_cb;
wd->done3data = userdata; wd->done3data = userdata;
widget_list = xitk_window_widget_list (wd->xwin); widget_list = xitk_window_widget_list (wd->xwin);
if (num_buttons) { if (num_buttons) {
xitk_labelbutton_widget_t lb; xitk_labelbutton_widget_t lb;
int bx, bdx, by, bwidth = 150; int bx, bdx, by, bwidth = 150;
if (bwidth > (winw - 8) / num_buttons) if (bwidth > (winw - 8) / num_buttons)
bwidth = (winw - 8) / num_buttons; bwidth = (winw - 8) / num_buttons;
bx = (winw - bwidth * num_buttons) / (num_buttons + 1); bx = (winw - bwidth * num_buttons) / (num_buttons + 1);
bdx = bx + bwidth; bdx = bx + bwidth;
by = winh - 50; by = winh - 50;
XITK_WIDGET_INIT (&lb); lb.nw.wl = widget_list;
lb.button_type = CLICK_BUTTON; lb.nw.skin_element_name = NULL;
lb.align = ALIGN_CENTER; lb.nw.userdata = wd;
lb.callback = _xitk_window_dialog_3_done; lb.button_type = CLICK_BUTTON;
lb.state_callback = NULL; lb.align = ALIGN_CENTER;
lb.userdata = wd; lb.callback = _xitk_window_dialog_3_done;
lb.skin_element_name = NULL; lb.state_callback = NULL;
if (button1_label) { if (button1_label) {
lb.label = _xitk_window_dialog_label (button1_label); lb.label = _xitk_window_dialog_label (button1_label);
wd->w[_W_w1] = xitk_noskin_labelbutton_create (widget_list, &lb, wd->w[_W_w1] = xitk_noskin_labelbutton_create (&lb,
bx, by, bwidth, 30, XITK_NOSKIN_TEXT_NORM, XITK_NOSKIN_TEXT_NORM, XITK_N OSKIN_TEXT_INV, DEFAULT_BOLD_FONT_12); bx, by, bwidth, 30, XITK_NOSKIN_TEXT_NORM, XITK_NOSKIN_TEXT_NORM, XITK_N OSKIN_TEXT_INV, DEFAULT_BOLD_FONT_12);
if (wd->w[_W_w1]) if (wd->w[_W_w1])
xitk_dlist_add_tail (&widget_list->list, &wd->w[_W_w1]->node); xitk_dlist_add_tail (&widget_list->list, &wd->w[_W_w1]->node);
bx += bdx; bx += bdx;
} }
if (button2_label) { if (button2_label) {
lb.label = _xitk_window_dialog_label (button2_label); lb.label = _xitk_window_dialog_label (button2_label);
wd->w[_W_w2] = xitk_noskin_labelbutton_create (widget_list, &lb, wd->w[_W_w2] = xitk_noskin_labelbutton_create (&lb,
bx, by, bwidth, 30, XITK_NOSKIN_TEXT_NORM, XITK_NOSKIN_TEXT_NORM, XITK_N OSKIN_TEXT_INV, DEFAULT_BOLD_FONT_12); bx, by, bwidth, 30, XITK_NOSKIN_TEXT_NORM, XITK_NOSKIN_TEXT_NORM, XITK_N OSKIN_TEXT_INV, DEFAULT_BOLD_FONT_12);
if (wd->w[_W_w2]) if (wd->w[_W_w2])
xitk_dlist_add_tail (&widget_list->list, &wd->w[_W_w2]->node); xitk_dlist_add_tail (&widget_list->list, &wd->w[_W_w2]->node);
bx += bdx; bx += bdx;
} }
if (button3_label) { if (button3_label) {
lb.label = _xitk_window_dialog_label (button3_label); lb.label = _xitk_window_dialog_label (button3_label);
wd->w[_W_w3] = xitk_noskin_labelbutton_create (widget_list, &lb, wd->w[_W_w3] = xitk_noskin_labelbutton_create (&lb,
bx, by, bwidth, 30, XITK_NOSKIN_TEXT_NORM, XITK_NOSKIN_TEXT_NORM, XITK_N OSKIN_TEXT_INV, DEFAULT_BOLD_FONT_12); bx, by, bwidth, 30, XITK_NOSKIN_TEXT_NORM, XITK_NOSKIN_TEXT_NORM, XITK_N OSKIN_TEXT_INV, DEFAULT_BOLD_FONT_12);
if (wd->w[_W_w3]) if (wd->w[_W_w3])
xitk_dlist_add_tail (&widget_list->list, &wd->w[_W_w3]->node); xitk_dlist_add_tail (&widget_list->list, &wd->w[_W_w3]->node);
} }
} }
wd->default_button = wd->w[_W_w3]; wd->default_button = wd->w[_W_w3];
if (!wd->default_button) { if (!wd->default_button) {
wd->default_button = wd->w[_W_w1]; wd->default_button = wd->w[_W_w1];
if (!wd->default_button) if (!wd->default_button)
wd->default_button = wd->w[_W_w2]; wd->default_button = wd->w[_W_w2];
 End of changes. 8 change blocks. 
24 lines changed or deleted 22 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)