From 10e41144596fc9ced40fc349d9ecd099b1c2ea19 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 11 Dec 2009 20:21:27 +0000
Subject: Initial import of Trinity 3.5.11 to kdebase Extends krandrtray, adds
 iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes
 Will need to check for commit warnings and repair as encountered Also needs
 full compile test

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kcontrol/randr/krandrtray.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'kcontrol/randr/krandrtray.h')

diff --git a/kcontrol/randr/krandrtray.h b/kcontrol/randr/krandrtray.h
index 829306437..9387f8cad 100644
--- a/kcontrol/randr/krandrtray.h
+++ b/kcontrol/randr/krandrtray.h
@@ -22,9 +22,12 @@
 #include <qptrlist.h>
 
 #include <ksystemtray.h>
+#include <kglobalaccel.h>
 
 #include "randr.h"
 
+#include "lowlevel_randr.h"
+
 class KHelpMenu;
 class KPopupMenu;
 
@@ -34,6 +37,7 @@ class KRandRSystemTray :  public KSystemTray, public RandRDisplay
 
 public:
 	KRandRSystemTray(QWidget* parent = 0, const char *name = 0);
+	KGlobalAccel *globalKeys;
 
 	virtual void contextMenuAboutToShow(KPopupMenu* menu);
 
@@ -45,16 +49,27 @@ protected slots:
 	void slotOrientationChanged(int parameter);
 	void slotRefreshRateChanged(int parameter);
 	void slotPrefs();
+	void slotSKeys();
+	void slotSettingsChanged(int category);
+	void slotCycleDisplays();
+	void slotOutputChanged(int parameter);
 
 protected:
 	void mousePressEvent( QMouseEvent *e );
 
 private:
 	void populateMenu(KPopupMenu* menu);
+	void addOutputMenu(KPopupMenu* menu);
+	int GetDefaultResolutionParameter();
+	void findPrimaryDisplay();
 
 	bool m_popupUp;
 	KHelpMenu* m_help;
 	QPtrList<KPopupMenu> m_screenPopups;
+
+	Display *randr_display;
+	ScreenInfo *randr_screen_info;
+	QWidget* my_parent;
 };
 
 #endif
-- 
cgit v1.2.1