Menu
▾
▴
[Amsn-commits] msn gui.tcl,1.741,1.742
|
From: Jerome Gagnon-V. <ger...@us...> - 2004-07-31 22:05:20
|
Update of /cvsroot/amsn/msn In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31538 Modified Files: gui.tcl Log Message: Remove font -sbolf from all buttons, to use default font used in initLook Index: gui.tcl =================================================================== RCS file: /cvsroot/amsn/msn/gui.tcl,v retrieving revision 1.741 retrieving revision 1.742 diff -C2 -d -r1.741 -r1.742 *** gui.tcl 31 Jul 2004 19:33:12 -0000 1.741 --- gui.tcl 31 Jul 2004 22:05:10 -0000 1.742 *************** *** 65,68 **** --- 65,69 ---- font create splainf -family $family -size $size -weight normal font create sbolditalf -family $family -size $size -weight bold -slant italic + font create macfont -family [list {Lucida Grande}] -size 13 -weight normal if { [::config::getKey strictfonts] } { *************** *** 142,149 **** --- 143,153 ---- if {![catch {tk windowingsystem} wsystem] && $wsystem == "aqua"} { option add *Scrollbar.width 15 userDefault + option add *Button.Font macfont userDefault } elseif { $tcl_platform(platform) == "windows"} { option add *Scrollbar.width 14 userDefault + option add *Button.Font sboldf userDefault } else { option add *Scrollbar.width 12 userDefault + option add *Button.Font sboldf userDefault } option add *Font splainf userDefault *************** *** 209,214 **** frame .tlsdown.f ! button .tlsdown.f.ok -text "[trans ok]" -command "::amsn::downloadTLS; bind .tlsdown <Destroy> {}; destroy .tlsdown" -font sboldf ! button .tlsdown.f.cancel -text "[trans cancel]" -command "destroy .tlsdown" -font sboldf pack .tlsdown.f.cancel -side right -padx 10 -pady 10 --- 213,218 ---- frame .tlsdown.f ! button .tlsdown.f.ok -text "[trans ok]" -command "::amsn::downloadTLS; bind .tlsdown <Destroy> {}; destroy .tlsdown" ! button .tlsdown.f.cancel -text "[trans cancel]" -command "destroy .tlsdown" pack .tlsdown.f.cancel -side right -padx 10 -pady 10 *************** *** 300,304 **** pack $w.progress -side top -padx 10 -pady 3 ! button $w.close -text "[trans cancel]" -command "" -font sboldf pack $w.close -side bottom -pady 5 -padx 10 --- 304,308 ---- pack $w.progress -side top -padx 10 -pady 3 ! button $w.close -text "[trans cancel]" -command "" pack $w.close -side bottom -pady 5 -padx 10 *************** *** 983,987 **** ! button $w.close -text "[trans cancel]" -command $cancelcmd -font sboldf pack $w.close -side bottom -pady 5 --- 987,991 ---- ! button $w.close -text "[trans cancel]" -command $cancelcmd pack $w.close -side bottom -pady 5 *************** *** 1593,1598 **** frame $w.fb ! button $w.fb.ok -text [trans ok] -command [list ::amsn::enterCustomStyleOk $w] -font sboldf ! button $w.fb.cancel -text [trans cancel] -command "destroy $w" -font sboldf --- 1597,1602 ---- frame $w.fb ! button $w.fb.ok -text [trans ok] -command [list ::amsn::enterCustomStyleOk $w] ! button $w.fb.cancel -text [trans cancel] -command "destroy $w" *************** *** 2577,2582 **** -borderwidth 1 -elementborderwidth 1 ! button $wname.buttons.ok -text "[trans ok]" -command [list ::amsn::listChooseOk $wname $itemlist $command] -font sboldf ! button $wname.buttons.cancel -text "[trans cancel]" -command [list destroy $wname] -font sboldf --- 2581,2586 ---- -borderwidth 1 -elementborderwidth 1 ! button $wname.buttons.ok -text "[trans ok]" -command [list ::amsn::listChooseOk $wname $itemlist $command] ! button $wname.buttons.cancel -text "[trans cancel]" -command [list destroy $wname] *************** *** 2587,2591 **** if { $other == 1 } { ! button $wname.buttons.other -text "[trans other]..." -command [list ::amsn::listChooseOther $wname $title $command] -font sboldf pack $wname.buttons.ok -padx 5 -side right pack $wname.buttons.cancel -padx 5 -side right --- 2591,2595 ---- if { $other == 1 } { ! button $wname.buttons.other -text "[trans other]..." -command [list ::amsn::listChooseOther $wname $title $command] pack $wname.buttons.ok -padx 5 -side right pack $wname.buttons.cancel -padx 5 -side right *************** *** 4477,4484 **** frame .status.bot -relief sunken -borderwidth 1 ! button .status.bot.save -text "[trans savetofile]" -command status_save -font sboldf ! button .status.bot.clear -text "Clear" -font sboldf \ -command ".status.info delete 0.0 end" ! button .status.bot.close -text [trans close] -command toggle_status -font sboldf pack .status.bot.save .status.bot.close .status.bot.clear -side left --- 4481,4488 ---- frame .status.bot -relief sunken -borderwidth 1 ! button .status.bot.save -text "[trans savetofile]" -command status_save ! button .status.bot.clear -text "Clear" \ -command ".status.info delete 0.0 end" ! button .status.bot.close -text [trans close] -command toggle_status pack .status.bot.save .status.bot.close .status.bot.clear -side left *************** *** 4826,4832 **** set buttonframe [frame .login.buttons -class Degt] ! button $buttonframe.cancel -text [trans cancel] -command "ButtonCancelLogin .login" -font sboldf ! button $buttonframe.ok -text [trans ok] -command login_ok -font sboldf ! button $buttonframe.addprofile -text [trans addprofile] -command AddProfileWin -font sboldf if { [::config::getGlobalKey disableprofiles]!=1} { pack $buttonframe.ok $buttonframe.cancel $buttonframe.addprofile -side right -padx 10 --- 4830,4836 ---- set buttonframe [frame .login.buttons -class Degt] ! button $buttonframe.cancel -text [trans cancel] -command "ButtonCancelLogin .login" ! button $buttonframe.ok -text [trans ok] -command login_ok -default active ! button $buttonframe.addprofile -text [trans addprofile] -command AddProfileWin if { [::config::getGlobalKey disableprofiles]!=1} { pack $buttonframe.ok $buttonframe.cancel $buttonframe.addprofile -side right -padx 10 *************** *** 4950,4955 **** set buttonframe [frame .add_profile.buttons -class Degt] ! button $buttonframe.cancel -text [trans cancel] -command "grab release .add_profile; destroy .add_profile" -font sboldf ! button $buttonframe.ok -text [trans ok] -command "AddProfileOk $mainframe" -font sboldf AddProfileOk $mainframe --- 4954,4959 ---- set buttonframe [frame .add_profile.buttons -class Degt] ! button $buttonframe.cancel -text [trans cancel] -command "grab release .add_profile; destroy .add_profile" ! button $buttonframe.ok -text [trans ok] -command "AddProfileOk $mainframe" AddProfileOk $mainframe *************** *** 5892,5898 **** frame .addcontact.b ! button .addcontact.b.next -text "[trans next]->" -command addcontact_next -font sboldf button .addcontact.b.cancel -text [trans cancel] \ ! -command "set pcc 0; destroy .addcontact" -font sboldf pack .addcontact.b.next .addcontact.b.cancel -side right -padx 5 --- 5896,5902 ---- frame .addcontact.b ! button .addcontact.b.next -text "[trans next]->" -command addcontact_next button .addcontact.b.cancel -text [trans cancel] \ ! -command "set pcc 0; destroy .addcontact" pack .addcontact.b.next .addcontact.b.cancel -side right -padx 5 *************** *** 5943,5949 **** frame .otherwindow.b button .otherwindow.b.ok -text "[trans ok]" \ ! -command "run_command_otherwindow \"$command\"" -font sboldf button .otherwindow.b.cancel -text [trans cancel] \ ! -command "grab release .otherwindow;destroy .otherwindow" -font sboldf pack .otherwindow.b.ok .otherwindow.b.cancel -side right -padx 5 --- 5947,5953 ---- frame .otherwindow.b button .otherwindow.b.ok -text "[trans ok]" \ ! -command "run_command_otherwindow \"$command\"" button .otherwindow.b.cancel -text [trans cancel] \ ! -command "grab release .otherwindow;destroy .otherwindow" pack .otherwindow.b.ok .otherwindow.b.cancel -side right -padx 5 *************** *** 6009,6015 **** frame ${wname}.b ! button ${wname}.b.ok -text [trans ok] -font sboldf \ -command [list newcontact_ok ${wname} $new_login $new_name] ! button ${wname}.b.cancel -text [trans cancel] -font sboldf \ -command [list destroy ${wname}] pack ${wname}.b.ok ${wname}.b.cancel -side right -padx 5 --- 6013,6019 ---- frame ${wname}.b ! button ${wname}.b.ok -text [trans ok] \ -command [list newcontact_ok ${wname} $new_login $new_name] ! button ${wname}.b.cancel -text [trans cancel]\ -command [list destroy ${wname}] pack ${wname}.b.ok ${wname}.b.cancel -side right -padx 5 *************** *** 6073,6078 **** frame $w.fb ! button $w.fb.ok -text [trans ok] -command change_name_ok -font sboldf ! button $w.fb.cancel -text [trans cancel] -command "destroy $w" -font sboldf --- 6077,6082 ---- frame $w.fb ! button $w.fb.ok -text [trans ok] -command change_name_ok ! button $w.fb.cancel -text [trans cancel] -command "destroy $w" *************** *** 7263,7271 **** label .picbrowser.mypic_label -text "[trans mypic]" -font splainf ! button .picbrowser.browse -command "set selected_image \[pictureChooseFile\]; reloadAvailablePics" -text "[trans browse]..." -font sboldf ! button .picbrowser.delete -command "pictureDeleteFile ;reloadAvailablePics" -text "[trans delete]" -font sboldf ! button .picbrowser.purge -command "purgePictures; reloadAvailablePics" -text "[trans purge]..." -font sboldf ! button .picbrowser.ok -command "set_displaypic \${selected_image};destroy .picbrowser" -text "[trans ok]" -font sboldf ! button .picbrowser.cancel -command "destroy .picbrowser" -text "[trans cancel]" -font sboldf checkbutton .picbrowser.showcache -command "reloadAvailablePics" -variable show_cached_pics\ --- 7267,7275 ---- label .picbrowser.mypic_label -text "[trans mypic]" -font splainf ! button .picbrowser.browse -command "set selected_image \[pictureChooseFile\]; reloadAvailablePics" -text "[trans browse]..." ! button .picbrowser.delete -command "pictureDeleteFile ;reloadAvailablePics" -text "[trans delete]" ! button .picbrowser.purge -command "purgePictures; reloadAvailablePics" -text "[trans purge]..." ! button .picbrowser.ok -command "set_displaypic \${selected_image};destroy .picbrowser" -text "[trans ok]" ! button .picbrowser.cancel -command "destroy .picbrowser" -text "[trans cancel]" checkbutton .picbrowser.showcache -command "reloadAvailablePics" -variable show_cached_pics\ *************** *** 7652,7659 **** frame .degt.bot -relief sunken -borderwidth 1 -class Degt ! button .degt.bot.save -text "[trans savetofile]" -command degt_protocol_save -font sboldf ! button .degt.bot.clear -text "Clear" -font sboldf \ -command ".degt.mid.txt delete 0.0 end" ! button .degt.bot.close -text [trans close] -command degt_protocol_win_toggle -font sboldf pack .degt.bot.save .degt.bot.close .degt.bot.clear -side left --- 7656,7663 ---- frame .degt.bot -relief sunken -borderwidth 1 -class Degt ! button .degt.bot.save -text "[trans savetofile]" -command degt_protocol_save ! button .degt.bot.clear -text "Clear" \ -command ".degt.mid.txt delete 0.0 end" ! button .degt.bot.close -text [trans close] -command degt_protocol_win_toggle pack .degt.bot.save .degt.bot.close .degt.bot.clear -side left *************** *** 7842,7851 **** pack $w.ignoreerrors -in $w.med -side left -padx 10 -pady 5 ! button $w.button -text [trans ok] -command "set closed_bug_window 1" -default active -highlightbackground #e8e8e8 -activeforeground #5b76c6 pack $w.button -in $w.bot #Execute script on Mac OS X to create a mail in "Mail" application and attach the bugreport to the mail if {![catch {tk windowingsystem} wsystem] && $wsystem == "aqua"} { ! button $w.mail -text [trans sendmail] -command "exec osascript plugins/applescript/mail-bugreport.scpt &" -highlightbackground #e8e8e8 -activeforeground #5b76c6 pack $w.mail -in $w.bot } --- 7846,7855 ---- pack $w.ignoreerrors -in $w.med -side left -padx 10 -pady 5 ! button $w.button -text [trans ok] -command "set closed_bug_window 1" -default active -highlightbackground #e8e8e8 -activeforeground #5b76c6 -pady 1 pack $w.button -in $w.bot #Execute script on Mac OS X to create a mail in "Mail" application and attach the bugreport to the mail if {![catch {tk windowingsystem} wsystem] && $wsystem == "aqua"} { ! button $w.mail -text [trans sendmail] -command "exec osascript plugins/applescript/mail-bugreport.scpt &" -highlightbackground #e8e8e8 -activeforeground #5b76c6 -pady 1 pack $w.mail -in $w.bot } |