Merge remote-tracking branch 'origin/master'

1 files changed, 20 insertions, 4 deletions

diff --git a/src-qt5/core-utils/lumina-xconfig/MainUI.h b/src-qt5/core-utils/lumina-xconfig/MainUI.h
index 5a1a62cc..d1abc153 100644
--- a/src-qt5/core-utils/lumina-xconfig/MainUI.h
+++ b/src-qt5/core-utils/lumina-xconfig/MainUI.h
@@ -11,6 +11,10 @@
 #include <QRect>
 #include <QString>
 #include <QList>
+#include <QMdiArea>
+#include <QMdiSubWindow>
+#include <QMenu>
+#include <QAction>
 
 #include "ScreenSettings.h"
 
@@ -34,20 +38,32 @@ public slots:
 private:
 	Ui::MainUI *ui;
 	QList<ScreenInfo> SCREENS;
+	double scaleFactor;
+	QMenu *singleTileMenu;
+
 	ScreenInfo currentScreenInfo();
 
-	QStringList currentOpts();
+	//QStringList currentOpts();
+	QString currentSelection();
 
 	void AddScreenToWidget(ScreenInfo);
+	void SyncBackend(); //sync backend structures to current settings
 
 private slots:
 	void UpdateScreens();
 	void ScreenSelected();
-	void MoveScreenLeft();
-	void MoveScreenRight();
-	void DeactivateScreen(QString device = "");
+	void updateNewScreenResolutions();
+	void tileScreensY(bool activeonly = false);
+	void tileScreensX(bool activeonly = false);
+	void tileScreens();
+	void tileSingleScreen(QAction*);
+	void showMenu(){ singleTileMenu->popup(QCursor::pos()); }
+
+	void DeactivateScreen();
 	void ActivateScreen();
 	void ApplyChanges(); //config changes
+	void SaveSettings();
+	void RestartFluxbox();
 };
 
 #endif