Imported Upstream version 16.6.0~ds0

1 files changed, 3 insertions, 5 deletions

diff --git a/src/minigui.cpp b/src/minigui.cpp
index d0ba9ed..9b43dfe 100644
--- a/src/minigui.cpp
+++ b/src/minigui.cpp
@@ -37,6 +37,7 @@ MiniGui::MiniGui( QWidget * parent, Qt::WindowFlags flags )
 	createActions();
 	createControlWidget();
 	createFloatingControl();
+	populateMainMenu();
 
 #if USE_CONFIGURABLE_TOOLBARS
 	connect( editControlAct, SIGNAL(triggered()), controlwidget, SLOT(edit()) );
@@ -85,12 +86,9 @@ void MiniGui::createActions() {
 	#endif
 #endif
 
-	time_label_action = new TimeLabelAction(this);
+	time_label_action = createTimeLabelAction(TimeLabelAction::CurrentAndTotalTime, this);
 	time_label_action->setObjectName("timelabel_action");
 
-	connect( this, SIGNAL(timeChanged(QString)),
-             time_label_action, SLOT(setText(QString)) );
-
 #if USE_CONFIGURABLE_TOOLBARS
 	editControlAct = new MyAction( this, "edit_control_minigui" );
 	editFloatingControlAct = new MyAction( this, "edit_floating_control_minigui" );
@@ -127,7 +125,7 @@ void MiniGui::createControlWidget() {
 
 void MiniGui::createFloatingControl() {
 	// Floating control
-	floating_control = new AutohideWidget(panel);
+	floating_control = new AutohideWidget(mplayerwindow);
 	floating_control->setAutoHide(true);
 
 	EditableToolbar * iw = new EditableToolbar(floating_control);