Changes in / [256b1c08:27dc485]


Ignore:
Location:
src-qt4
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/PCDM.pro

    r24ef714 r68de35a  
    44TEMPLATE = app 
    55 
    6 LIBS += -L../libpcbsd -L/usr/local/lib -lpcbsd-ui -lpcbsd-utils -lpam 
     6LIBS += -L../libpcbsd -L/usr/local/lib -lpcbsd-ui -lpcbsd-utils -lpam -lX11 
    77INCLUDEPATH += ../libpcbsd/utils /usr/local/include 
    88 
     
    120120conf=pcdm.conf 
    121121conf.path=/usr/local/share/PCDM 
    122 conf.extra=cp pcdm.conf /usr/local/share/PCDM/pcdm.conf.sample 
     122conf.extra=cp pcdm.conf /usr/local/share/PCDM/pcdm.conf 
    123123 
    124124INSTALLS += dotrans scripts rcd cleanthemes theme conf target 
  • src-qt4/PCDM/PCDMd

    r6e8238f r68de35a  
    1010  echo "Starting PCDM XDMCP Server" 
    1111  while [ 1 ]; do 
    12     xinit /usr/local/bin/PCDM-session -- /usr/local/bin/X :0 -displayfd /usr/local/share/PCDM/.xdisplay -indirect ${HOST} 
     12    xinit /usr/local/bin/PCDM-session --once -- /usr/local/bin/X :0 -displayfd /usr/local/share/PCDM/.xdisplay -indirect ${HOST} 
    1313  done 
    1414else 
     
    2020  while [ 1 ]; do 
    2121    /usr/local/bin/pc-checkxdisplay 
    22     xinit /usr/local/bin/PCDM-session -- :0   
     22    xinit /usr/local/bin/PCDM-session --once -- :0   
    2323  done 
    2424fi 
  • src-qt4/PCDM/src/main.cpp

    r6e8238f r68de35a  
    1313#include <QTime> 
    1414#include <QDebug> 
     15#include <QX11Info> 
     16//#include <X11/Xlib.h> 
    1517 
    1618#include "pcdm-gui.h" 
     
    2729//#endif 
    2830 
    29 int main(int argc, char *argv[]) 
    30 { 
    31   int returnCode = 0; 
     31int runSingleSession(int argc, char *argv[]){ 
    3232  //QTime clock; 
    3333  //clock.start(); 
     
    117117    //qDebug() << "Showing GUI:" << QString::number(clock.elapsed())+" ms"; 
    118118    w.show(); 
    119     returnCode = a.exec(); 
     119    a.exec(); 
    120120 
    121121  }  // end of PCDM GUI running 
     
    124124  desktop.waitForSessionClosed(); 
    125125   
    126   return returnCode; 
     126  //Clean up Code 
     127  delete &desktop; 
     128  delete &a; 
     129  delete &splash; 
     130  //XSetCloseDownMode(QX11Info::display(), DestroyAll); 
     131  //XCLoseDisplay(QX11Info::display()); 
     132   
     133   
     134  return 0; 
    127135} 
     136 
     137int main(int argc, char *argv[]) 
     138{ 
     139 bool neverquit = TRUE; 
     140 bool runonce = FALSE; 
     141 if(argc==2){ if( QString(argv[1]) == "--once"){ runonce = TRUE; } } 
     142   
     143 while(neverquit){ 
     144  if(runonce){ neverquit = FALSE; } 
     145  qDebug() << " -- PCDM Session Starting..."; 
     146  int retCode = runSingleSession(argc,argv); 
     147  if(retCode != 0){ neverquit=FALSE; } 
     148 } 
     149 return 0; 
     150} 
  • src-qt4/about-gui/i18n/AboutGui_fa.ts

    rad04b1b r0fa122e  
    6262            <translation>Ù 
    6363حیط‌های ٠
    64 ÛŒØ²Ú©Ø§Ø±:         </translation> 
     64یزکار:</translation> 
    6565        </message> 
    6666        <message> 
     
    9292        <message> 
    9393            <source>System components...</source> 
    94             <translation type="unfinished"> 
    95             </translation> 
     94            <translation> 
     95            اجزای سیست٠
     96</translation> 
    9697        </message> 
    9798        <message> 
    9899            <source>Desktop environments...</source> 
    99             <translation type="unfinished"> 
    100             </translation> 
     100            <translation>Ù 
     101حیط‌های Ù 
     102یزکار</translation> 
    101103        </message> 
    102104        <message> 
    103105            <source>PC-BSD CLI utilities:</source> 
    104             <translation type="unfinished"> 
    105             </translation> 
     106            <translation>اؚزارهای خط فر٠
     107ان PC-BSD:</translation> 
    106108        </message> 
    107109        <message> 
    108110            <source>PC-BSD UI utilities:</source> 
    109             <translation type="unfinished"> 
    110             </translation> 
     111            <translation> 
     112            اؚزارهای راؚط کارؚری PC-BSD:</translation> 
    111113        </message> 
    112114    </context> 
  • src-qt4/pc-sysmanager/pbsystemtab.cpp

    rad90f5d rcf89547  
    158158 
    159159void PBSystemTab::ReadUname() 
    160 { 
     160{     
    161161    if (GetUname->canReadLine() ) 
    162         labelBASEVer->setText( GetUname->readLine().simplified() ); 
     162    { 
     163        QString uname = GetUname->readLine().simplified(); 
     164        labelBASEVer->setText( uname ); 
     165        Version= uname.section(" ",0,0); 
     166    } 
    163167} 
    164168 
  • src-qt4/pc-sysmanager/portsnapprogress.cpp

    r1620346 r56d05c5  
    6161    QString branch; 
    6262    // Figure out which to download 
    63     if ( pcVer.indexOf(".") != -1 ) 
     63    if ( pcVer.indexOf("STABLE") ) 
     64       branch = "/stable/" + pcVer.section(".", 0, 0);  
     65    else if ( pcVer.indexOf(".") != -1 ) 
    6466       branch = "/releng/" + pcVer.section("-", 0, 0);  
    65     else if ( pcVer.indexOf("STABLE") ) 
    66        branch = "/stable/" + pcVer.section("-", 0, 0);  
    6767    else 
    6868       branch = "/head"; 
  • src-qt4/port-files/pkg-plist

    r24ef714 r68de35a  
    23392339share/pcbsd/splash-screens/loading-screen-tr.pcx 
    23402340share/pcbsd/splash-screens/loading-screen-mn.pcx 
    2341 share/PCDM/pcdm.conf.sample 
     2341share/PCDM/pcdm.conf 
    23422342share/PCDM/i18n/PCDM_af.qm 
    23432343share/PCDM/i18n/PCDM_ar.qm 
Note: See TracChangeset for help on using the changeset viewer.