Remove old macro segment controls

src/headers/advanced-scene-switcher.hpp

@@ -177,7 +177,6 @@ public slots:
 	void on_saveWindowGeo_stateChanged(int state);
 	void on_showTrayNotifications_stateChanged(int state);
 	void on_uiHintsDisable_stateChanged(int state);
-	void on_useVerticalMacroControls_stateChanged(int state);
 	void on_highlightExecutedMacros_stateChanged(int state);
 	void on_hideLegacyTabs_stateChanged(int state);
 

src/headers/macro-controls.hpp

@@ -1,33 +0,0 @@
-#pragma once
-
-#include <QFrame>
-#include <QPropertyAnimation>
-#include <QScrollArea>
-#include <QPushButton>
-#include <QLayout>
-#include <QWidget>
-
-class MacroEntryControls : public QWidget {
-	Q_OBJECT
-
-public:
-	explicit MacroEntryControls(bool vertical = false,
-				    const int animationDuration = 300,
-				    QWidget *parent = 0);
-	void Show(bool visible = true);
-
-signals:
-	void Add();
-	void Remove();
-	void Up();
-	void Down();
-
-private:
-	bool _vertical = false;
-	bool _visible = false;
-	QPushButton *_add;
-	QPushButton *_remove;
-	QPushButton *_up;
-	QPushButton *_down;
-	QPropertyAnimation *_animation = nullptr;
-};

src/headers/macro-segment.hpp

@@ -1,6 +1,5 @@
 #pragma once
 #include <QWidget>
-#include <QTimer>
 #include <QFrame>
 #include <QVBoxLayout>
 #include <obs.hpp>
@@ -30,14 +29,12 @@ private:
 
 class Section;
 class QLabel;
-class MacroEntryControls;
 
 class MacroSegmentEdit : public QWidget {
 	Q_OBJECT
 
 public:
-	MacroSegmentEdit(bool verticalControls = true,
-			 QWidget *parent = nullptr);
+	MacroSegmentEdit(QWidget *parent = nullptr);
 	// Use this function to avoid accidental edits when scrolling through
 	// list of actions and conditions
 	void SetFocusPolicyOfWidgets();
@@ -46,13 +43,7 @@ public:
 
 protected slots:
 	void HeaderInfoChanged(const QString &);
-	void Add();
-	void Remove();
-	void Up();
-	void Down();
 	void Collapsed(bool);
-	void ShowControls();
-	void HideControls();
 signals:
 	void MacroAdded(const QString &name);
 	void MacroRemoved(const QString &name);
@@ -60,26 +51,17 @@ signals:
 	void SceneGroupAdded(const QString &name);
 	void SceneGroupRemoved(const QString &name);
 	void SceneGroupRenamed(const QString &oldName, const QString newName);
-	void AddAt(int idx);
-	void RemoveAt(int idx);
-	void UpAt(int idx);
-	void DownAt(int idx);
 	void SelectionChagned(int idx);
 
 protected:
-	void enterEvent(QEvent *e);
-	void leaveEvent(QEvent *e);
 	void mousePressEvent(QMouseEvent *event);
 
 	Section *_section;
 	QLabel *_headerInfo;
-	MacroEntryControls *_controls;
 	QFrame *_frame;
 	QVBoxLayout *_highLightFrameLayout;
 
 private:
-	QTimer _enterTimer;
-	QTimer _leaveTimer;
 	virtual MacroSegment *Data() = 0;
 };
 

src/headers/switcher-data-structs.hpp

@@ -87,7 +87,6 @@ struct SwitcherData {
 	bool stop = false;
 	bool verbose = false;
 	bool disableHints = false;
-	bool useVerticalMacroControls = false;
 	bool hideLegacyTabs = false;
 	bool highlightExecutedMacros = false;
 	bool showSystemTrayNotifications = false;