Changeset 31f63e1


Ignore:
Timestamp:
05/04/14 09:49:05 (10 months ago)
Author:
Susanne Jaeckel <susanne_j@…>
Parents:
0f8bf78 (diff), 7dfbedf (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 7dfbedfc703b5164e9207923da79c9f24c75fe16 into 0f8bf780779d4f11430b24968f47aa7d4dfb3e45

Location:
lumina
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • lumina/DEPENDENCIES

    r59538c3 r15d962a  
    1111Qt 4.8+ (modules: core, gui, network, linguist, svg) 
    1212  also includes: (qt4-qmake, qt4-uic, qt4-moc, qt4-rcc) 
     13  + devel/qt4-qtsolutions-singleapplication 
    1314X.org and XLib 
  • lumina/lumina-desktop/panel-plugins/clock/LClock.cpp

    r214f3d5 r7dfbedf  
    2828  QDateTime CT = QDateTime::currentDateTime(); 
    2929  //Now update the display 
    30   label->setText( CT.toString("h:mm AP") ); 
    31   label->setToolTip(CT.toString("ddd M/d/yy")); 
     30  QLocale sys = QLocale::system(); 
     31  label->setText( CT.toString(sys.timeFormat(QLocale::ShortFormat)) ); 
     32  label->setToolTip(CT.toString(sys.dateFormat())); 
    3233} 
  • lumina/lumina-desktop/panel-plugins/clock/LClock.h

    r214f3d5 r7dfbedf  
    1313#include <QWidget> 
    1414#include <QString> 
     15#include <QLocale> 
    1516 
    1617#include "../LPPlugin.h" 
Note: See TracChangeset for help on using the changeset viewer.