From 2adf9ed0317059dd306e238055676d406d82830a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= Date: Sat, 8 Jul 2006 19:13:50 +0000 Subject: [PATCH] * complete clean-up --- .../English.lproj/Interaction.nib/info.nib | 7 +-- .../Interaction.nib/keyedobjects.nib | Bin 10659 -> 10659 bytes modules/gui/macosx/interaction.h | 1 + modules/gui/macosx/interaction.m | 50 ++++++++++-------- modules/gui/macosx/intf.h | 1 - modules/gui/macosx/intf.m | 9 ---- 6 files changed, 33 insertions(+), 35 deletions(-) diff --git a/extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib b/extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib index cd510a34d2..ed64cca67e 100644 --- a/extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib +++ b/extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib @@ -5,13 +5,14 @@ IBDocumentLocation 97 142 356 240 0 0 1440 878 IBFramework Version - 443.0 + 446.1 IBOpenObjects - 79 + 5 55 + 79 IBSystem Version - 8I127 + 8J135 diff --git a/extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib index 64b69dfbfb84c075de39e5cfa9820fbaa71cdf07..06c835ef4562315897f7a60e05c5e16ade9534ea 100644 GIT binary patch delta 2616 zcmah}2~btn89v{=7nFCr_nvznqDWbk<$-JuGzuzCu1jSuch(QgYqH(F^RISoz z)OcLM9W^+k)ks|%a3j&wT07QhQj;2|noMnpPBIf~D=|IqK@%s#)wq9 zQ$EESrL{f1xQDcB)jHKdn$%tLy<4vD zQFqH{kGfZ`?eokdjSs#>`jZsoV{ARfqCl)QLQ_1)$04t9d|9dYK$@ISAjJns zDg4Pba-TbRG7sfZJiYz$bQIU47&F9OqaR8{S2NGI408@(j+kS{spY5;JI!9c3sF^% zDsjn-_IV8zSSlWw-CfJE94ov$w1V>-`Q-ZXM4oq>EFp8qJehbUNx*6m&xTB`Ay3Iu ztiw{$M!qJ`$u}VF-1B_iTRvlWHc#Mjx5-R0iv*Ao;>MdYk>CoS$Vc(Q4`jr-GUltK zTy9s$%*(O8BX_NMpQQ)x_GZ`z@%;>Vq0#syr&C0xc8v_MFfo>>vPr_$>kZuy;vvj?fS(JbcL zy}UbjI(GgnYV85iNB40-{HbH_VF$ie(b<_k*HK78eIFMrj`;5=T&6YK~) zCp_*4*b*z9St@Wz+;BFkvL><0f4EP$5{b*=xBl_ol{WvS^28Ofr0Y=cys7Ijc_JGv z!Y3e0)|?v2gJ)*Hv?kj{bzC%!qqKG-p!R`i&)g{Ai_nD?rQ;Yp!+r% zRS^RNFG@4D1$L(u$^$9uc`55DF+b2>^y!h|J@JzsMe+ZmLsX(dRa8~gR3D|rBg^KX zH2c3b5o3b3`*@iVtwCwkiR3=Hrkq5Bydzan9w@t|K1A^15e@CDq*9VYR7*W6yWv~N5^#_`o-{4Dps;jFRYqCqypp7(q)FdyBu#l?r_YO%(AC-HsKH;24}g@|FH&!>-M;cOZk#6~d(>&XVP>1+g>#fsTPHkeIjSW7X;j<2XM?Mxk1r#)y84W>~viKfwPI*u08GP;6ppquDsx`l3|jr0^fL(kFk^c~tv z|49Eq|4E6EbB}q#JZD}s zKQteje>XojADdq=gE3|^f7X?CW7UDIH;ZEl%*~P|eVnaitJxY>!(M0W*#@?k?PvAu z5POTYu=m(C_8WGc-C#G_U#(y()aq%4TalK_im_s?1j}uuS$S5zRbY*?imV#zb!)w~ z!P;bPwzgQ?tQ}UZb;@e7Zdf<153M`aed~$!)cV&PtIc|D6I-!0+t==FJ8YL7W5?R@ zc7pA;lkL&=JiFYkv=`V__F{X9z17}s@3iaeUG^S(pMB20V}ESlweQ(~u^-r2P*&8cvsUigTK?*g4Z#;(XcpO5=@)Ox64}_;K*_5WkRsknj+9$l%8CXpVma DH^tqQ delta 2627 zcmai03s6ZD?f z@v%@J*B7EjGO>vgQ>y`=B(c$Ishu>nsdhAzK8!I*C(RV1-E+Z-opjpSnKNhi{QLj^ z_xSJJc6+;hYgdyBZr}l)pn(@quz@%DLkK(tkuVzKARflR49JH9D2At@3@Ts|RKc^b z7=8rRPy@?g1+0YU;RRR+8=x6fnP&xTg;v-Dd*Lt~f!E+D9D`rLDflIvfiAcV*Wowl zRro#Jg4+=337^4z_`gxBzG{3&d}_Xf&~+u%P{=2IdE8dXLsQA&=Ir&K8~0z+Mpuk2KIDZ8zA z#i{I3_A2|7{fZ|rd453d4!|jSvQOD5GI3-Y>Q}?n2z8Visg72o&_Oj?jZtIOI5l2P zP!rW8HCY{_rl@1pR5eXaSI4Ot>Uebm>h0WzJBGLe00u=AcEM8s5HB> zc9Emz2HJ|YAz!o|32;ZPFqB7g(^S3ZW3_t1d|~frodFlL3NM^(_p&zsop!J zP)5vzB2hsCD`tVc9qdqoGAgK1XfJ4}uUuH;u-C7su3cPKXdig#1?x&F6qS@#J67=t zy~rvu2Q4^+9N>dKKzFz&PvRqZ1kV}(y8tTNp%NB~kI7hY2x`o9Ujj=H!cyTdVwB}j zCt8e9_j+h(hX(Pk5jkZw)IlT1d={V1^FKmM&{9-`mZ4fn?{Zix*NZNC?!ixZfn0?i zJf6?IfmX}N8rjQw6bCPfNIKDfBl;G73$H*U>PO$9hv*R?^omPGP6OPw%Q7uuKOLr9 zId=}`bc#zf%YUEiW*fBp;AW5+oz(%ayO=NM&HtbIpTnE*7958Y&?(DU%)cX=&CG;B z<|TuV8GTGpJQ8ULzweiPb)nUHdMdY#EUcJ;Kd5Pqtg=8!qA0 z`^L!j+I(YWu4}&0@_wIuwun)F5%O-KeD;V2ze5lv0)}k>EDjF)narw)4F7Y|GX4I; zv^soOy5zKU$w~2?zqd#Z$Z4DAj}mY* zszY_MoaNbpWt}D9K3I#Jt#fN<#XyH^IntIta&MrO*tiT-SW-pI=6OKOu5y7 z9B0L0mGpD@Zvb)vD)4SoI^!uK6)CJpy^V; zX7r4lwnkKn?x0+_B*k1Sf7IroG6}Z>72-ZLSHhgj)1+XVq@-_1`6?yUbSZMd79P&K zc(5e%B;UdF_zbE4Zb|EAen6t%$j@-WxA8=&x|6>xeUQ&vB~KpG7ssR&N&E!gC3!06 zb}7wakv-yJ#dw-S!|4#3M>FYsI+j^=l8k zkQeq+z1+Qq>V_VohwG#C(Rz$NNuQ;c=%sp@K3CtQ@7Is(XY|YZNBUj;OTCW_C5!}< zkR}pJ!bk*(BvB-W#F1o@LQ=^rQckK!Em=j@kac7uagsyi7&$@SCSBw`@&Wl3xk7$T zu9J_+ZSn>Ar$G!qBiI;gOfu#hi;Wti$#~gt8hefXMw`)YoHV+P9^(_^zVX2L%J_%z z4Yg4p>PP))0BsshgK0cXq{%cz5>rH9q8sQ&x`}S4Tj(|_=plN99;L6-H|S;hA-zhk z(d)FA-k_hGp=OvFVMdx!W{eqUCYZ@)ikWSen5AZ!IoF(LZZ@}=+e~4$nmf#0rqkSO z?l(`Hm(5=DhWUwk%lwPkXMVTDe8l7*7Usr=Fb}3Nof#~K#jymI#FAMGOJzmuIku8D zuvKggdx8C!?Phz}K6Ze$v37Qtb+cRS&+HESlzqnj%KmN}YV)*t*@(@snKqj(##U)t mWOLXS+p29#JFkZ2D#nALuYw*0>%jrR;lWA4lR8I6a`-p8J>0PX diff --git a/modules/gui/macosx/interaction.h b/modules/gui/macosx/interaction.h index 12f21c616b..d82141bf0c 100644 --- a/modules/gui/macosx/interaction.h +++ b/modules/gui/macosx/interaction.h @@ -59,6 +59,7 @@ interaction_dialog_t * p_dialog; intf_thread_t * p_intf; + NSProgressIndicator * o_mainIntfPgbar; BOOL nib_interact_loaded; } diff --git a/modules/gui/macosx/interaction.m b/modules/gui/macosx/interaction.m index aac169c021..962d137a5c 100644 --- a/modules/gui/macosx/interaction.m +++ b/modules/gui/macosx/interaction.m @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include "intf.h" +#import "intf.h" #import "interaction.h" /***************************************************************************** @@ -125,6 +125,7 @@ [o_auth_ok_btn setTitle: _NS("OK")]; [o_input_ok_btn setTitle: _NS("OK")]; [o_input_cancel_btn setTitle: _NS("Cancel")]; + o_mainIntfPgbar = [[VLCMain sharedInstance] getMainIntfPgbar]; } NSString *o_title = [NSString stringWithUTF8String:p_dialog->psz_title ? p_dialog->psz_title : "title"]; @@ -149,9 +150,12 @@ { o_window = [NSApp mainWindow]; } - + + #if 0 msg_Dbg( p_intf, "Title: %s", [o_title UTF8String] ); msg_Dbg( p_intf, "Description: %s", [o_description UTF8String] ); + #endif + if( p_dialog->i_id == DIALOG_ERRORS ) { msg_Err( p_intf, "Error: %s", p_dialog->psz_description ); @@ -190,14 +194,14 @@ msg_Dbg( p_intf, "user progress dialog requested" ); [o_prog_title setStringValue: o_title]; [o_prog_description setStringValue: o_description]; - [o_prog_bar setFloatValue: p_dialog->val.f_float]; + [o_prog_bar setDoubleValue: (double)p_dialog->val.f_float]; [NSApp beginSheet: o_prog_win modalForWindow: o_window modalDelegate: self didEndSelector: nil contextInfo: nil]; [o_prog_win makeKeyWindow]; } else if( p_dialog->i_flags & DIALOG_PSZ_INPUT_OK_CANCEL ) { - msg_Dbg( p_intf, "text input requested" ); + msg_Dbg( p_intf, "text input from user requested" ); [o_input_title setStringValue: o_title]; [o_input_description setStringValue: o_description]; [o_input_fld setStringValue: @""]; @@ -208,15 +212,15 @@ else if( p_dialog->i_flags & DIALOG_INTF_PROGRESS ) { msg_Dbg( p_intf, "progress-bar in main intf requested" ); - [[[VLCMain sharedInstance] getMainScrollField] - setStringValue: o_description]; - [[[VLCMain sharedInstance] getMainIntfPgbar] - setFloatValue: p_dialog->val.f_float]; - [[[VLCMain sharedInstance] getMainIntfPgbar] setHidden: NO]; + [[VLCMain sharedInstance] setScrollField: o_description stopAfter: -1]; + [o_mainIntfPgbar setDoubleValue: (double)p_dialog->val.f_float]; + [o_mainIntfPgbar setHidden: NO]; [[[VLCMain sharedInstance] getControllerWindow] makeKeyWindow]; + [o_mainIntfPgbar setIndeterminate: NO]; } else - msg_Warn( p_intf, "requested dialog type unknown" ); + msg_Err( p_intf, "requested dialog type unknown (%i)", + p_dialog->i_flags ); } } @@ -250,28 +254,28 @@ { [o_prog_description setStringValue: \ [NSString stringWithUTF8String: p_dialog->psz_description]]; - [o_prog_bar setFloatValue: p_dialog->val.f_float]; + [o_prog_bar setDoubleValue: (double)p_dialog->val.f_float]; if( [o_prog_bar doubleValue] == 100.0 ) { /* we are done, let's hide */ [self hideDialog]; - return; } + return; } if( p_dialog->i_flags & DIALOG_INTF_PROGRESS ) { - [[[VLCMain sharedInstance] getMainScrollField] setStringValue: \ - [NSString stringWithUTF8String: p_dialog->psz_description]]; - [[[VLCMain sharedInstance] getMainIntfPgbar] setFloatValue: \ - p_dialog->val.f_float]; + [[VLCMain sharedInstance] setScrollField: + [NSString stringWithUTF8String: p_dialog->psz_description] + stopAfter: -1]; + [o_mainIntfPgbar setDoubleValue: (double)p_dialog->val.f_float]; - if( [[[VLCMain sharedInstance] getMainIntfPgbar] doubleValue] == 100.0 ) + if( [o_mainIntfPgbar doubleValue] == 100.0 ) { /* we are done, let's hide */ [self hideDialog]; - return; } + return; } } @@ -295,15 +299,17 @@ } if( p_dialog->i_flags & DIALOG_INTF_PROGRESS ) { - [[[VLCMain sharedInstance] getMainIntfPgbar] setIndeterminate: YES]; - [[[VLCMain sharedInstance] getMainScrollField] setStringValue: @""]; - [[[VLCMain sharedInstance] getMainIntfPgbar] setHidden: YES]; + [o_mainIntfPgbar setIndeterminate: YES]; + [o_mainIntfPgbar setHidden: YES]; + [[VLCMain sharedInstance] resetScrollField]; } } -(void)destroyDialog { msg_Dbg( p_intf, "destroy event" ); + if( o_mainIntfPgbar ) + [o_mainIntfPgbar release]; } - (IBAction)cancelAndClose:(id)sender @@ -318,7 +324,6 @@ - (IBAction)okayAndClose:(id)sender { - msg_Dbg( p_intf, "dialog's okay btn pressed, returning values" ); vlc_mutex_lock( &p_dialog->p_interaction->object_lock ); if( p_dialog->i_flags == DIALOG_LOGIN_PW_OK_CANCEL ) { @@ -330,6 +335,7 @@ p_dialog->i_return = DIALOG_OK_YES; p_dialog->i_status = ANSWERED_DIALOG; vlc_mutex_unlock( &p_dialog->p_interaction->object_lock ); + msg_Dbg( p_intf, "dialog acknowledged" ); } @end diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index df19aeda93..3edc07e649 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -294,7 +294,6 @@ struct intf_sys_t - (id)getEmbeddedList; - (id)getInteractionList; - (id)getMainIntfPgbar; -- (id)getMainScrollField; - (id)getControllerWindow; - (void)terminate; - (NSString *)localizedString:(char *)psz; diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 269442e676..0ceafeffec 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -922,15 +922,6 @@ static VLCMain *_o_sharedMainInstance = nil; return nil; } -- (id)getMainScrollField -{ - if( o_scrollfield ) - return o_scrollfield; - - msg_Err( p_intf, "main scroll field item wasn't found" ); - return nil; -} - - (id)getControllerWindow { if( o_window ) -- 2.39.2