Changes in / [87d35b7:ed24336]


Ignore:
Location:
src-qt4/PCDM
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/PCDMd

    r68de35a rb1457e5  
    55 
    66#See if XDMCP support is enabled for logging in to this system 
    7 if [ -f /usr/local/share/PCDM/pcdm.conf .and. -z "`grep ALLOW_REMOTE_LOGIN=TRUE /usr/local/share/PCDM/pcdm.conf`"];  
     7if [ -f /usr/local/share/PCDM/pcdm.conf .and. -z "`grep ALLOW_REMOTE_LOGIN=TRUE /usr/local/share/PCDM/pcdm.conf`" ];  
    88then 
    99  # XDMCP is enabled 
    1010  echo "Starting PCDM XDMCP Server" 
    11   while [ 1 ]; do 
     11  while [ ! -e /var/run/nologin ]; do 
    1212    xinit /usr/local/bin/PCDM-session --once -- /usr/local/bin/X :0 -displayfd /usr/local/share/PCDM/.xdisplay -indirect ${HOST} 
    1313  done 
     
    1818  touch /tmp/.PCDMAUTOLOGINFILE 
    1919  # Now start the X Server 
    20   while [ 1 ]; do 
     20  while [ ! -e /var/run/nologin ]; do 
    2121    /usr/local/bin/pc-checkxdisplay 
    2222    xinit /usr/local/bin/PCDM-session --once -- :0   
  • src-qt4/PCDM/images/.directory

    r1620346 r4018e43  
    11[Dolphin] 
    2 Timestamp=2013,2,12,14,28,59 
     2PreviewsShown=true 
     3Timestamp=2013,7,10,10,57,40 
    34Version=3 
    4 ViewMode=2 
  • src-qt4/PCDM/src/main.cpp

    rabea4e8 rb1457e5  
    5454  } 
    5555  splash.show(); 
     56  QCoreApplication::processEvents(); //Process the splash screen event immediately 
    5657  //qDebug() << "SplashScreen Started:" << QString::number(clock.elapsed())+" ms"; 
    5758  //Initialize the xprocess 
     
    118119    w.show(); 
    119120    a.exec(); 
    120  
    121121  }  // end of PCDM GUI running 
    122    
     122  int retcode = 0; 
    123123  //Wait for the desktop session to finish before exiting 
    124124  desktop.waitForSessionClosed(); 
     125  splash.show(); //show the splash screen again 
     126  splash.showMessage(QObject::tr("System Shutting Down"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white); 
     127  //check for shutdown process 
     128  if(QFile::exists("/var/run/nologin")){ 
     129    //Pause for a few seconds to prevent starting a new session during a shutdown 
     130    QTime wTime = QTime::currentTime().addSecs(30); 
     131    while( QTime::currentTime() < wTime ){  
     132      //Keep processing events during the wait (for splashscreen) 
     133      QCoreApplication::processEvents(QEventLoop::AllEvents, 100);  
     134    } 
     135    //set the return code for a shutdown 
     136    retcode = -1; //make sure it does not start a new session 
     137  } 
    125138   
    126139  //Clean up Code 
     
    132145   
    133146   
    134   return 0; 
     147  return retcode; 
    135148} 
    136149 
     
    138151{ 
    139152 bool neverquit = TRUE; 
    140  bool runonce = FALSE; 
     153 bool runonce = TRUE; //looping is currently not working yet - needs to restart X each time? 
    141154 if(argc==2){ if( QString(argv[1]) == "--once"){ runonce = TRUE; } } 
    142155   
  • src-qt4/PCDM/src/pcdm-gui.cpp

    ra5bc020 r4018e43  
    149149      sdeSwitcher = new QComboBox(this);  
    150150      sdeSwitcher->setFocusPolicy( Qt::NoFocus ); 
     151      sdeSwitcher->setIconSize(currentTheme->itemIconSize("toolbar")); 
    151152      toolbar->addWidget(sdeSwitcher); 
    152153      //Add an additional spacer 
     
    345346    Backend::log("PCDM: Shutting down computer"); 
    346347    system("shutdown -p now"); 
     348    close(); 
    347349  } 
    348350} 
     
    360362    Backend::log("PCDM: Restarting computer"); 
    361363    system("shutdown -r now"); 
     364    close(); 
    362365  } 
    363366} 
  • src-qt4/PCDM/themes/default/default.theme

    ra3c7851 r4018e43  
    4545# TOOLBAR SETTINGS 
    4646TOOLBAR_LOCATION=bottom         # [bottom | top | left | right] 
    47 TOOLBAR_IMAGE_SIZE=32x32     # Set the default size for all images in the toolbar 
     47TOOLBAR_IMAGE_SIZE=28x28     # Set the default size for all images in the toolbar 
    4848TOOLBAR_STYLE=textbesideicon            # [icononly | textonly | textbesideicon | textundericon] 
    4949 
Note: See TracChangeset for help on using the changeset viewer.