diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-06 21:30:51 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-06 21:30:51 +0000 |
| commit | 1246e0a69ee389910f7aa31b66dc04e177262eb4 (patch) | |
| tree | 786967d091b562bff4023393acf961dfd532643d /kcontrol/displayconfig/displayconfig.h | |
| parent | caa013c9b01cbf98005893312eea91701295f40e (diff) | |
| download | tdebase-1246e0a69ee389910f7aa31b66dc04e177262eb4.tar.gz tdebase-1246e0a69ee389910f7aa31b66dc04e177262eb4.zip | |
Force any ICC settings to override gamma sliders
Fix application of ICC settings from displayconfig module
Disallow dragging of primary monitor in displayconfig module
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1257648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/displayconfig/displayconfig.h')
| -rw-r--r-- | kcontrol/displayconfig/displayconfig.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h index 35cf7fa6c..6c283e308 100644 --- a/kcontrol/displayconfig/displayconfig.h +++ b/kcontrol/displayconfig/displayconfig.h @@ -69,6 +69,7 @@ k_dcop: private: KConfig *config; + KCModule *iccTab; bool _ok; Display *randr_display; ScreenInfo *randr_screen_info; @@ -87,7 +88,7 @@ private: TQPtrList<SingleScreenData> m_screenInfoArray; int realResolutionSliderValue(); void setRealResolutionSliderValue(int index); - void addTab( const TQString name, const TQString label ); + KCModule* addTab( const TQString name, const TQString label ); void moveMonitor(DraggableMonitor* monitor, int realx, int realy); bool applyMonitorLayoutRules(void); bool applyMonitorLayoutRules(DraggableMonitor* primary_monitor); |