[Sim-icq-commit] sim/sim parse.ll,1.48,1.49 userbox.cpp,1.95,1.96 userview.cpp,1.78,1.79

[<sh...@us...>]

Update of /cvsroot/sim-icq/sim/sim
In directory sc8-pr-cvs1:/tmp/cvs-serv2233

Modified Files:
	parse.ll userbox.cpp userview.cpp 
Log Message:
Add slovak translation


Index: parse.ll
===================================================================
RCS file: /cvsroot/sim-icq/sim/sim/parse.ll,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** parse.ll	4 Mar 2003 17:06:19 -0000	1.48
--- parse.ll	7 Mar 2003 02:35:42 -0000	1.49
***************
*** 44,58 ****
  %option prefix="parser"
  
! %x x_tag
  %x x_word
  %%
  
! (http|https|ftp)"://"([A-Za-z0-9-]+\.)*[A-Za-z0-9-]+"/"[A-Za-z0-9/\,\.\?\@\&:\;\(\)\-_\+\%=~\#]+		{ return URL; }
! (http|https|ftp)"://"([A-Za-z0-9-]+\.)*[A-Za-z0-9-]+				{ return URL; }
  (mailto:)?[A-Za-z0-9\-_]+\@([A-Za-z0-9\-]+\.)+[A-Za-z]+				{ return MAIL; }
! "www"(\.[A-Za-z0-9-]+)+"/"[A-Za-z0-9/\,\.\?\&:\;\(\)\-_\+\%=~\#]+	{ return HTTP_URL; }
! "www"(\.[A-Za-z0-9-]+)+												{ return HTTP_URL; }
! "ftp"(\.[A-Za-z0-9-]+)+"/"[A-Za-z0-9/\,\.:\;\-_\+~]+				{ return FTP_URL; }
! "ftp"(\.[A-Za-z0-9-]+)+												{ return FTP_URL; }
  <INITIAL,x_word>"&quot;"		{ BEGIN(INITIAL); return TXT; }
  <INITIAL,x_word>"&amp;"			{ BEGIN(INITIAL); return TXT; }
--- 44,58 ----
  %option prefix="parser"
  
! %x x_tag
  %x x_word
  %%
  
! (http|https|ftp)"://"([A-Za-z0-9-]+\.)*[A-Za-z0-9-]+(\:[0-9]+)?"/"[A-Za-z0-9/\,\.\?\@\&:\;\(\)\-_\+\%=~\#]+		{ return URL; }
! (http|https|ftp)"://"([A-Za-z0-9-]+\.)*[A-Za-z0-9-]+(\:[0-9]+)?				{ return URL; }
  (mailto:)?[A-Za-z0-9\-_]+\@([A-Za-z0-9\-]+\.)+[A-Za-z]+				{ return MAIL; }
! "www"(\.[A-Za-z0-9-]+)+(:[0-9]+)?"/"[A-Za-z0-9/\,\.\?\&:\;\(\)\-_\+\%=~\#]+	{ return HTTP_URL; }
! "www"(\.[A-Za-z0-9-]+)+(:[0-9]+)?												{ return HTTP_URL; }
! "ftp"(\.[A-Za-z0-9-]+)+(:[0-9]+)?"/"[A-Za-z0-9/\,\.:\;\-_\+~]+				{ return FTP_URL; }
! "ftp"(\.[A-Za-z0-9-]+)+(:[0-9]+)?												{ return FTP_URL; }
  <INITIAL,x_word>"&quot;"		{ BEGIN(INITIAL); return TXT; }
  <INITIAL,x_word>"&amp;"			{ BEGIN(INITIAL); return TXT; }
***************
*** 60,64 ****
  <INITIAL,x_word>"&gt;"			{ BEGIN(INITIAL); return TXT; }
  <INITIAL,x_word>"\t"			{ BEGIN(INITIAL); return TAB; }
! <INITIAL,x_word>" "[ ]+			{ BEGIN(INITIAL); return LONGSPACE; }
  <INITIAL,x_word>[\:\.\,\ \(\)]	{ BEGIN(INITIAL); return TXT; }
  <INITIAL,x_word>"<br"\ *\/?">"	{ BEGIN(INITIAL); return BR; }
--- 60,64 ----
  <INITIAL,x_word>"&gt;"			{ BEGIN(INITIAL); return TXT; }
  <INITIAL,x_word>"\t"			{ BEGIN(INITIAL); return TAB; }
! <INITIAL,x_word>" "[ ]+			{ BEGIN(INITIAL); return LONGSPACE; }
  <INITIAL,x_word>[\:\.\,\ \(\)]	{ BEGIN(INITIAL); return TXT; }
  <INITIAL,x_word>"<br"\ *\/?">"	{ BEGIN(INITIAL); return BR; }
***************
*** 192,200 ****
                  string url = ICQClient::unquoteText(yytext);
                  string text = yytext;
!                 res += "<a href=\"";
                  res += url.c_str();
                  res += "\">";
                  res += text.c_str();
!                 res += "</a>";
                  break;
              }
--- 192,200 ----
                  string url = ICQClient::unquoteText(yytext);
                  string text = yytext;
!                 res += "<ul><a href=\"";
                  res += url.c_str();
                  res += "\">";
                  res += text.c_str();
!                 res += "</a></ul>";
                  break;
              }
***************
*** 204,212 ****
                  if (url.substr(0, 7) != "mailto:")
                      url = string("mailto:") + url;
!                 res += "<a href=\"";
                  res += url.c_str();
                  res += "\">";
                  res += text.c_str();
!                 res += "</a>";
                  break;
              }
--- 204,212 ----
                  if (url.substr(0, 7) != "mailto:")
                      url = string("mailto:") + url;
!                 res += "<ul><a href=\"";
                  res += url.c_str();
                  res += "\">";
                  res += text.c_str();
!                 res += "</a></ul>";
                  break;
              }

Index: userbox.cpp
===================================================================
RCS file: /cvsroot/sim-icq/sim/sim/userbox.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** userbox.cpp	7 Feb 2003 17:44:22 -0000	1.95
--- userbox.cpp	7 Mar 2003 02:35:42 -0000	1.96
***************
*** 199,206 ****
      connect(accel, SIGNAL(activated(int)), this, SLOT(accelActivated(int)));
      accel->insertItem(Key_Left + ALT, mnuWindow + 11);
!     accel->insertItem(Key_Right + ALT, mnuWindow + 12);
  #ifndef WIN32
      accel->insertItem(Key_Left + SHIFT, mnuWindow + 11);
!     accel->insertItem(Key_Right + SHIFT, mnuWindow + 12);
  #endif
      accel->insertItem(ACCEL(ICQ_MSGxMSG), mnuMessage);
--- 199,206 ----
      connect(accel, SIGNAL(activated(int)), this, SLOT(accelActivated(int)));
      accel->insertItem(Key_Left + ALT, mnuWindow + 11);
!     accel->insertItem(Key_Right + ALT, mnuWindow + 12);
  #ifndef WIN32
      accel->insertItem(Key_Left + SHIFT, mnuWindow + 11);
!     accel->insertItem(Key_Right + SHIFT, mnuWindow + 12);
  #endif
      accel->insertItem(ACCEL(ICQ_MSGxMSG), mnuMessage);

Index: userview.cpp
===================================================================
RCS file: /cvsroot/sim-icq/sim/sim/userview.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** userview.cpp	24 Jan 2003 10:58:24 -0000	1.78
--- userview.cpp	7 Mar 2003 02:35:42 -0000	1.79
***************
*** 764,768 ****
  bool UserView::eventFilter(QObject *obj, QEvent *e)
  {
!     if (e->type() == QEvent::Leave) 
          hideTip();
      if (obj == menuGroup){
--- 764,768 ----
  bool UserView::eventFilter(QObject *obj, QEvent *e)
  {
!     if (e->type() == QEvent::Leave)
          hideTip();
      if (obj == menuGroup){