Changeset 2d615ae


Ignore:
Timestamp:
05/21/13 06:33:59 (15 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
14f87ef
Parents:
b898ceb
Message:

Fix the PCDM background to the main window only, and remove an extra function from the loginwidget class.

Location:
src-qt4/PCDM/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/src/loginWidget.cpp

    r1620346 r2d615ae  
    6565  connect(userIcon,SIGNAL(triggered(QAction*)), this, SLOT(slotUserActivated(QAction*))); 
    6666  connect(listUsers,SIGNAL(activated(int)),this,SLOT(slotChooseUser(int))); 
    67   connect(listUserBig,SIGNAL(itemClicked(QListWidgetItem*)),this,SLOT(slotUserClicked(QListWidgetItem*)) ); 
     67  connect(listUserBig,SIGNAL(itemClicked(QListWidgetItem*)),this,SLOT(slotUserSelected()) ); 
    6868  connect(listUserBig,SIGNAL(currentRowChanged(int)),this,SLOT(slotUserHighlighted(int)) ); 
    6969  allowPasswordView(allowPWVisible); //setup signal/slots for pushViewPassword 
     
    134134} 
    135135 
    136 void LoginWidget::slotUserClicked(QListWidgetItem* item){ 
     136/*void LoginWidget::slotUserClicked(QListWidgetItem* item){ 
    137137  slotUserSelected();    
    138 } 
     138}*/ 
    139139 
    140140void LoginWidget::slotUserHighlighted(int row){ 
  • src-qt4/PCDM/src/loginWidget.h

    r1620346 r2d615ae  
    6969  private slots: 
    7070        void slotUserActivated(QAction*); 
    71         void slotUserClicked(QListWidgetItem*); 
     71        //void slotUserClicked(QListWidgetItem*); 
    7272        void slotUserHighlighted(int); 
    7373        void slotUserSelected(); 
  • src-qt4/PCDM/src/pcdm-gui.cpp

    r1620346 r2d615ae  
    2626    createGUIfromTheme(); 
    2727    //Now make sure that the login widget has keyboard focus 
    28     loginW->resetFocus();  
     28    loginW->resetFocus(); 
     29    this->setObjectName("PCDM-background"); 
    2930} 
    3031 
     
    6364    if( tmpIcon.isEmpty() || !QFile::exists(tmpIcon) ){ tmpIcon = ":/images/backgroundimage.jpg"; } 
    6465    //use "border-image" instead of "background-image" to stretch rather than tile the image 
    65     QString bgstyle = "PCDMgui {border-image: url(BGIMAGE) stretch;}";  
     66    QString bgstyle = "QMainWindow#PCDM-background {border-image: url(BGIMAGE) stretch;}";  
    6667    bgstyle.replace("BGIMAGE", tmpIcon); 
    6768    style.append(bgstyle); 
     
    383384  QStringList kLayouts = Backend::keyLayouts(); 
    384385  //Startup the GUI 
    385   wKey = new widgetKeyboard(this); 
     386  wKey = new widgetKeyboard(); 
    386387  wKey->programInit(kModels, kLayouts); 
    387388  wKey->setWindowModality(Qt::ApplicationModal); 
Note: See TracChangeset for help on using the changeset viewer.