Changeset 165 for smplayer/trunk/src/minigui.cpp
- Timestamp:
- May 16, 2014, 9:51:55 AM (11 years ago)
- Location:
- smplayer/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
smplayer/trunk
- Property svn:mergeinfo changed
/smplayer/vendor/current merged: 163
- Property svn:mergeinfo changed
-
smplayer/trunk/src/minigui.cpp
r156 r165 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 3Ricardo Villalba <rvm@users.sourceforge.net>2 Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net> 3 3 4 4 This program is free software; you can redistribute it and/or modify … … 19 19 #include "minigui.h" 20 20 #include "widgetactions.h" 21 #include " floatingwidget.h"21 #include "autohidewidget.h" 22 22 #include "myaction.h" 23 23 #include "mplayerwindow.h" … … 39 39 40 40 #if USE_CONFIGURABLE_TOOLBARS 41 connect( editControlAct, SIGNAL(triggered()), 42 controlwidget, SLOT(edit()) ); 43 floating_control->toolbar()->takeAvailableActionsFrom(this); 44 connect( editFloatingControlAct, SIGNAL(triggered()), 45 floating_control->toolbar(), SLOT(edit()) ); 46 #endif 47 48 connect( this, SIGNAL(cursorNearBottom(QPoint)), 49 this, SLOT(showFloatingControl(QPoint)) ); 50 51 connect( this, SIGNAL(cursorFarEdges()), 52 this, SLOT(hideFloatingControl()) ); 41 connect( editControlAct, SIGNAL(triggered()), controlwidget, SLOT(edit()) ); 42 EditableToolbar * iw = static_cast<EditableToolbar *>(floating_control->internalWidget()); 43 iw->takeAvailableActionsFrom(this); 44 connect( editFloatingControlAct, SIGNAL(triggered()), iw, SLOT(edit()) ); 45 #endif 53 46 54 47 statusBar()->hide(); … … 127 120 void MiniGui::createFloatingControl() { 128 121 // Floating control 129 floating_control = new FloatingWidget(this); 130 floating_control->setLayoutDirection(Qt::LeftToRight); 122 floating_control = new AutohideWidget(panel); 123 floating_control->setAutoHide(true); 124 125 EditableToolbar * iw = new EditableToolbar(floating_control); 126 iw->setObjectName("floating_control"); 131 127 132 128 #if USE_CONFIGURABLE_TOOLBARS … … 138 134 #endif 139 135 floatingcontrol_actions << "separator" << "timelabel_action"; 140 floating_control->toolbar()->setDefaultActions(floatingcontrol_actions);136 iw->setDefaultActions(floatingcontrol_actions); 141 137 #else 142 floating_control->toolbar()->addAction(playOrPauseAct);143 floating_control->toolbar()->addAction(stopAct);144 floating_control->toolbar()->addSeparator();145 floating_control->toolbar()->addAction(timeslider_action);146 floating_control->toolbar()->addSeparator();147 floating_control->toolbar()->addAction(fullscreenAct);148 floating_control->toolbar()->addAction(muteAct);138 iw->addAction(playOrPauseAct); 139 iw->addAction(stopAct); 140 iw->addSeparator(); 141 iw->addAction(timeslider_action); 142 iw->addSeparator(); 143 iw->addAction(fullscreenAct); 144 iw->addAction(muteAct); 149 145 #if USE_VOLUME_BAR 150 floating_control->toolbar()->addAction(volumeslider_action);146 iw->addAction(volumeslider_action); 151 147 #endif 148 #endif // USE_CONFIGURABLE_TOOLBARS 149 150 floating_control->setInternalWidget(iw); 151 152 #if !USE_CONFIGURABLE_TOOLBARS 152 153 floating_control->adjustSize(); 153 #endif // USE_CONFIGURABLE_TOOLBARS 154 #endif 155 156 floating_control->hide(); 154 157 } 155 158 … … 188 191 BaseGuiPlus::aboutToEnterFullscreen(); 189 192 193 floating_control->setMargin(pref->floating_control_margin); 194 floating_control->setPercWidth(pref->floating_control_width); 195 floating_control->setAnimated(pref->floating_control_animated); 196 floating_control->setActivationArea( (AutohideWidget::Activation) pref->floating_activation_area); 197 floating_control->setHideDelay(pref->floating_hide_delay); 198 QTimer::singleShot(500, floating_control, SLOT(activate())); 199 190 200 if (!pref->compact_mode) { 191 201 controlwidget->hide(); … … 196 206 BaseGuiPlus::aboutToExitFullscreen(); 197 207 198 floating_control->hide(); 208 floating_control->deactivate(); 209 //floating_control->hide(); 199 210 200 211 if (!pref->compact_mode) { … … 216 227 217 228 controlwidget->show(); 218 }219 220 void MiniGui::showFloatingControl(QPoint /*p*/) {221 #ifndef Q_OS_WIN222 floating_control->setBypassWindowManager(pref->bypass_window_manager);223 #endif224 floating_control->setAnimated( pref->floating_control_animated );225 floating_control->setMargin(pref->floating_control_margin);226 floating_control->showOver(panel,227 pref->floating_control_width,228 FloatingWidget::Bottom);229 }230 231 void MiniGui::hideFloatingControl() {232 floating_control->hide();233 229 } 234 230 … … 257 253 set->beginGroup( "actions" ); 258 254 set->setValue("controlwidget", controlwidget->actionsToStringList() ); 259 set->setValue("floating_control", floating_control->toolbar()->actionsToStringList() ); 255 EditableToolbar * iw = static_cast<EditableToolbar *>(floating_control->internalWidget()); 256 set->setValue("floating_control", iw->actionsToStringList() ); 260 257 set->endGroup(); 261 258 #endif … … 291 288 set->beginGroup( "actions" ); 292 289 controlwidget->setActionsFromStringList( set->value("controlwidget", controlwidget->defaultActions()).toStringList() ); 293 floating_control->toolbar()->setActionsFromStringList( set->value("floating_control", floating_control->toolbar()->defaultActions()).toStringList() ); 290 EditableToolbar * iw = static_cast<EditableToolbar *>(floating_control->internalWidget()); 291 iw->setActionsFromStringList( set->value("floating_control", iw->defaultActions()).toStringList() ); 294 292 floating_control->adjustSize(); 295 293 set->endGroup();
Note:
See TracChangeset
for help on using the changeset viewer.