Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

1 files changed, 62 insertions, 36 deletions

diff --git a/krandr/randr.h b/krandr/randr.h
index 5e77016f2..b4c830f02 100644
--- a/krandr/randr.h
+++ b/krandr/randr.h
@@ -29,42 +29,68 @@
 class KTimerDialog;
 class RandRScreenPrivate;
 
-struct SingleScreenData {
-	TQString screenFriendlyName;
-	bool generic_screen_detected;
-	bool screen_connected;
-
-	TQStringList resolutions;
-	TQStringList refresh_rates;
-	TQStringList color_depths;
-	TQStringList rotations;
-
-	int current_resolution_index;
-	int current_refresh_rate_index;
-	int current_color_depth_index;
-
-	float gamma_red;
-	float gamma_green;
-	float gamma_blue;
-
-	int current_rotation_index;
-	int current_orientation_mask;
-	bool has_x_flip;
-	bool has_y_flip;
-	bool supports_transformations;
-
-	bool is_primary;
-	bool is_extended;
-	int absolute_x_position;
-	int absolute_y_position;
-	int current_x_pixel_count;
-	int current_y_pixel_count;
-
-	bool has_dpms;
-	bool enable_dpms;
-	unsigned int dpms_standby_delay;
-	unsigned int dpms_suspend_delay;
-	unsigned int dpms_off_delay;
+class KRANDR_EXPORT HotPlugRule {
+	public:
+		enum states {
+			AnyState		= 0,
+			Connected		= 1,
+			Disconnected		= 2
+		};
+
+	public:
+		HotPlugRule();
+		virtual ~HotPlugRule();
+
+	public:
+		TQStringList outputs;
+		TQValueList< int > states;
+		TQString profileName;
+};
+
+typedef TQValueList< HotPlugRule > HotPlugRulesList;
+
+class KRANDR_EXPORT SingleScreenData {
+	public:
+		SingleScreenData();
+		virtual ~SingleScreenData();
+	
+	public:
+		TQString screenUniqueName;
+		TQString screenFriendlyName;
+		bool generic_screen_detected;
+		bool screen_connected;
+	
+		TQStringList resolutions;
+		TQStringList refresh_rates;
+		TQStringList color_depths;
+		TQStringList rotations;
+	
+		int current_resolution_index;
+		int current_refresh_rate_index;
+		int current_color_depth_index;
+	
+		float gamma_red;
+		float gamma_green;
+		float gamma_blue;
+	
+		int current_rotation_index;
+		int current_orientation_mask;
+		bool has_x_flip;
+		bool has_y_flip;
+		bool supports_transformations;
+	
+		bool is_primary;
+		bool is_extended;
+		int absolute_x_position;
+		int absolute_y_position;
+		int current_x_pixel_count;
+		int current_y_pixel_count;
+	
+		bool has_dpms;
+		bool enable_dpms;
+		unsigned int dpms_standby_delay;
+		unsigned int dpms_suspend_delay;
+		unsigned int dpms_off_delay;
 };
 
 class RandRScreen : public TQObject