Ignore:
Timestamp:
Oct 9, 2014, 2:54:21 PM (11 years ago)
Author:
Silvan Scherrer
Message:

SMPlayer: updated trunk to 14.9.0

Location:
smplayer/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • smplayer/trunk

  • smplayer/trunk/src/mpcgui/mpcgui.cpp

    r165 r170  
    135135        floating_control->hide();
    136136        spacer = new QSpacerItem(10,10);
     137
     138        floating_control_time = new QLabel(floating_control);
     139        floating_control_time->setAlignment(Qt::AlignRight);
     140        floating_control_time->setAutoFillBackground(true);
     141        ColorUtils::setBackgroundColor( floating_control_time, QColor(0,0,0) );
     142        ColorUtils::setForegroundColor( floating_control_time, QColor(255,255,255) );
     143
    137144}
    138145
     
    177184        floating_control->layout()->addItem(spacer);
    178185        floating_control->layout()->addWidget(controlwidget);
     186        floating_control->layout()->addWidget(floating_control_time);
    179187        controlwidget->show();
    180188        timeslidewidget->show();
     
    204212        floating_control->layout()->removeWidget(timeslidewidget);
    205213        floating_control->layout()->removeItem(spacer);
     214        floating_control->layout()->removeWidget(floating_control_time);
    206215        addToolBar(Qt::BottomToolBarArea, controlwidget);
    207216        addToolBarBreak(Qt::BottomToolBarArea);
     
    418427        time_display->setText( text );
    419428        time_label_action->setText(text );
     429        floating_control_time->setText(text);
    420430}
    421431
  • smplayer/trunk/src/mpcgui/mpcgui.h

    r165 r170  
    8585    QToolBar* timeslidewidget;
    8686
    87     QLabel * audiochannel_display;
     87        QLabel * audiochannel_display;
    8888        QLabel * time_display;
    8989        QLabel * frame_display;
     90
     91        QLabel * floating_control_time;
    9092
    9193        AutohideWidget * floating_control;
Note: See TracChangeset for help on using the changeset viewer.