Changeset 170 for smplayer/trunk/src/mpcgui
- Timestamp:
- Oct 9, 2014, 2:54:21 PM (11 years ago)
- Location:
- smplayer/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
smplayer/trunk
- Property svn:mergeinfo changed
/smplayer/vendor/current merged: 168
- Property svn:mergeinfo changed
-
smplayer/trunk/src/mpcgui/mpcgui.cpp
r165 r170 135 135 floating_control->hide(); 136 136 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 137 144 } 138 145 … … 177 184 floating_control->layout()->addItem(spacer); 178 185 floating_control->layout()->addWidget(controlwidget); 186 floating_control->layout()->addWidget(floating_control_time); 179 187 controlwidget->show(); 180 188 timeslidewidget->show(); … … 204 212 floating_control->layout()->removeWidget(timeslidewidget); 205 213 floating_control->layout()->removeItem(spacer); 214 floating_control->layout()->removeWidget(floating_control_time); 206 215 addToolBar(Qt::BottomToolBarArea, controlwidget); 207 216 addToolBarBreak(Qt::BottomToolBarArea); … … 418 427 time_display->setText( text ); 419 428 time_label_action->setText(text ); 429 floating_control_time->setText(text); 420 430 } 421 431 -
smplayer/trunk/src/mpcgui/mpcgui.h
r165 r170 85 85 QToolBar* timeslidewidget; 86 86 87 87 QLabel * audiochannel_display; 88 88 QLabel * time_display; 89 89 QLabel * frame_display; 90 91 QLabel * floating_control_time; 90 92 91 93 AutohideWidget * floating_control;
Note:
See TracChangeset
for help on using the changeset viewer.