Imported Upstream version 0.8.6

1 files changed, 9 insertions, 1 deletions

diff --git a/src/defaultgui.cpp b/src/defaultgui.cpp
index 8236a3c..c5ff60a 100644
--- a/src/defaultgui.cpp
+++ b/src/defaultgui.cpp
@@ -220,7 +220,9 @@ void DefaultGui::createMainToolBars() {
 	QStringList toolbar1_actions;
 	toolbar1_actions << "open_file" << "open_url" << "favorites_menu" << "separator"
                      << "screenshot" << "separator" << "show_file_properties" << "show_playlist"
-                     << "show_preferences" << "separator" << "play_prev" << "play_next";
+                     << "show_tube_browser" << "separator" << "show_preferences"
+                     << "separator" << "play_prev" << "play_next";
+
 	toolbar1->setDefaultActions(toolbar1_actions);
 #else
 	toolbar1->addAction(openFileAct);
@@ -279,6 +281,7 @@ void DefaultGui::createControlWidgetMini() {
 
 	controlwidget_mini = new EditableToolbar( this );
 	controlwidget_mini->setObjectName("controlwidget_mini");
+	controlwidget_mini->setLayoutDirection(Qt::LeftToRight);
 	//controlwidget_mini->setResizeEnabled(false);
 	controlwidget_mini->setMovable(false);
 	//addDockWindow(controlwidget_mini, Qt::DockBottom );
@@ -315,6 +318,7 @@ void DefaultGui::createControlWidget() {
 
 	controlwidget = new EditableToolbar( this );
 	controlwidget->setObjectName("controlwidget");
+	controlwidget->setLayoutDirection(Qt::LeftToRight);
 	//controlwidget->setResizeEnabled(false);
 	controlwidget->setMovable(false);
 	//addDockWindow(controlwidget, Qt::DockBottom );
@@ -377,6 +381,7 @@ void DefaultGui::createControlWidget() {
 void DefaultGui::createFloatingControl() {
 	// Floating control
 	floating_control = new FloatingWidget(this);
+	floating_control->setLayoutDirection(Qt::LeftToRight);
 
 #if USE_CONFIGURABLE_TOOLBARS
 	QStringList floatingcontrol_actions;
@@ -726,6 +731,7 @@ void DefaultGui::saveConfig() {
 		qDebug("DefaultGui::saveConfig: w: %d h: %d", width(), height());
 		set->setValue( "pos", pos() );
 		set->setValue( "size", size() );
+		set->setValue( "state", (int) windowState() );
 	}
 
 	set->setValue( "toolbars_state", saveState(Helper::qtVersion()) );
@@ -769,6 +775,8 @@ void DefaultGui::loadConfig() {
 		move(p);
 		resize(s);
 
+		setWindowState( (Qt::WindowStates) set->value("state", 0).toInt() );
+
 		if (!DesktopInfo::isInsideScreen(this)) {
 			move(0,0);
 			qWarning("DefaultGui::loadConfig: window is outside of the screen, moved to 0x0");