Changeset 6eb01ac


Ignore:
Timestamp:
07/08/13 09:02:32 (16 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
fbdee93
Parents:
7e47edf (diff), dc1f572 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Location:
src-qt4
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/themes/default/default.theme

    r4546cd2 rdc1f572  
    9595        border: 1px solid grey;  
    9696        border-radius: 5px; 
    97         padding: 10px; 
     97        padding: 15px; 
    9898} 
    9999QGroupBox::title{  
     
    101101        border: 1px solid grey; 
    102102        border-radius: 5px; 
     103        subcontrol-position: top center; 
    103104} 
    104105QLabel{  
  • src-qt4/pc-controlpanel/mainwnd.cpp

    r1620346 r7e47edf  
    7070    fillGroups(); 
    7171 
    72     mDirWatcher.addPath(PBI_INSTALLED_DIRECTORY); 
    73     mDirWatcher.addPath(SOFTWARE_DIR); 
    74     mDirWatcher.addPath(SYSTEM_DIR); 
    75     mDirWatcher.addPath(HARDWARE_DIR); 
    76     mDirWatcher.addPath(NETWORKING_DIR); 
    77     mDirWatcher.addPath(TOOLS_DIR); 
    78     mDirWatcher.addPath(DE_DIR); 
    79  
    80     QObject::connect(&mDirWatcher, SIGNAL(directoryChanged(const QString &)), 
    81                      this, SLOT(onDirectoryChanged(const QString &))); 
    82  
    8372} 
    8473 
Note: See TracChangeset for help on using the changeset viewer.