Changeset 4eecf13


Ignore:
Timestamp:
01/08/14 10:40:34 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
1558ce6
Parents:
531a3df0
Message:

Add a bit of debugging to the PCDM keyboard layout switcher.

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

Legend:

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

    ra982a19 r4eecf13  
    3232{ 
    3333  slotUpdateKbOnSys(); 
     34  this->close(); 
    3435} 
    3536 
  • src-qt4/PCDM/src/pcdm-backend.cpp

    ra7474ab r4eecf13  
    170170 
    171171// Function which lets us run setxkbmap 
    172 void Backend::changeKbMap(QString model, QString layout, QString variant) 
     172bool Backend::changeKbMap(QString model, QString layout, QString variant) 
    173173{ 
    174174   QProcess kbp; 
     175        kbp.setProcessChannelMode(QProcess::MergedChannels); 
    175176   QStringList args; 
    176177   QString prog; 
     
    182183   kbp.start(prog, args); 
    183184   kbp.waitForFinished(); 
     185   bool ok = (kbp.exitCode() == 0); 
     186   if(!ok){ 
     187     qDebug() << "Change KB Map Failed: "<<prog+" "+args.join(" "); 
     188     qDebug() << kbp.readAllStandardOutput(); 
     189   } 
     190   return ok; 
    184191} 
    185192 
  • src-qt4/PCDM/src/pcdm-backend.h

    ra982a19 r4eecf13  
    4040    static QStringList keyLayouts(); 
    4141    static QStringList keyVariants(const QString &layout, QStringList &savedKeyVariants); 
    42     static void changeKbMap(QString model, QString layout, QString variant); 
     42    static bool changeKbMap(QString model, QString layout, QString variant); 
    4343    static QStringList languages(); 
    4444    static void openLogFile(QString); 
Note: See TracChangeset for help on using the changeset viewer.