From: Christian Pulvermacher <christian@hazel.(none)>
Date: Mon, 11 Oct 2010 15:30:02 +0000 (+0200)
Subject: move zoom slider into toolbar
X-Git-Tag: 0.6~21
X-Git-Url: http://git.maemo.org/git/?p=presencevnc;a=commitdiff_plain;h=03a77587be4d8663073de5d01d8c53dd006560b9

move zoom slider into toolbar
---

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 71950be..0a46c65 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -60,24 +60,23 @@ MainWindow::MainWindow(QString url, int quality):
 	toolbar->addAction(QIcon("/usr/share/icons/hicolor/48x48/hildon/control_keyboard.png"), "", this, SLOT(showInputPanel()));
 #endif
 
+	/*
 	//move remaining buttons to the right
 	QWidget *spacer = new QWidget();
 	spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 	toolbar->addWidget(spacer);
+	*/
 
-	toolbar->addAction(QIcon("/usr/share/icons/hicolor/48x48/hildon/general_fullsize.png"), "", this, SLOT(toggleFullscreen()));
-	addToolBar(toolbar);
-	toolbar->setVisible(settings.value("show_toolbar", true).toBool());
-
-	//set up zoombar
-	zoombar = new QToolBar(0);
 	zoom_slider = new QSlider(Qt::Horizontal, 0);
 	zoom_slider->setRange(0, 100);
 	connect(zoom_slider, SIGNAL(valueChanged(int)),
 		this, SLOT(setZoomLevel(int)));
 	zoom_slider->setValue(settings.value("zoomlevel", 95).toInt());
-	zoombar->addWidget(zoom_slider);
-	addToolBar(zoombar);
+	toolbar->addWidget(zoom_slider);
+
+	toolbar->addAction(QIcon("/usr/share/icons/hicolor/48x48/hildon/general_fullsize.png"), "", this, SLOT(toggleFullscreen()));
+	addToolBar(toolbar);
+	toolbar->setVisible(settings.value("show_toolbar", true).toBool());
 
 	//set up menu
 	QAction *connect_action = new QAction(tr("Connect"), this);
@@ -335,6 +334,11 @@ void MainWindow::resizeEvent(QResizeEvent *event)
 	forceResize();
 	if(vnc_view)
 		vnc_view->setZoomLevel(zoom_slider->value());
+	
+#ifdef Q_WS_MAEMO_5
+	//hide zoom slider in portrait mode
+	zoom_slider->setVisible(height() < width());
+#endif
 }
 
 void MainWindow::showInputPanel()
diff --git a/src/mainwindow.h b/src/mainwindow.h
index d133ef6..91248e0 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -70,7 +70,7 @@ private:
 	void reloadSettings();
 	VncView *vnc_view;
 	ScrollArea *scroll_area;
-	QToolBar *toolbar, *zoombar;
+	QToolBar *toolbar;
 	QSlider *zoom_slider;
 	QAction *scaling, *show_toolbar, *disconnect_action;
 	KeyMenu *key_menu;