diff options
| author | Timothy Pearson <[email protected]> | 2013-01-08 20:18:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-08 20:18:50 -0600 |
| commit | 477e956a04dfb244814f274e98a8d6f4beb84f3f (patch) | |
| tree | 8ce70dbbd93389354327fd1c063c0a94ff30be87 /kcontrol/hwmanager | |
| parent | c24b096e62d6137acdcb71e5ed5b08d43ecbb928 (diff) | |
| download | tdebase-477e956a04dfb244814f274e98a8d6f4beb84f3f.tar.gz tdebase-477e956a04dfb244814f274e98a8d6f4beb84f3f.zip | |
Add per-user display settings
This partially resolves Bug 1264
Fix displayconfig crashes and warnings
Slightly clean up iccconfig and hwmanager
Diffstat (limited to 'kcontrol/hwmanager')
| -rw-r--r-- | kcontrol/hwmanager/devicepropsdlgbase.ui | 8 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwmanager.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwmanager.h | 3 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwmanagerbase.ui | 8 |
4 files changed, 2 insertions, 19 deletions
diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui index bd3688402..5f6c2c166 100644 --- a/kcontrol/hwmanager/devicepropsdlgbase.ui +++ b/kcontrol/hwmanager/devicepropsdlgbase.ui @@ -4,14 +4,6 @@ <property name="name"> <cstring>DevicePropertiesDialogBase</cstring> </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>519</width> - <height>356</height> - </rect> - </property> <grid> <property name="name"> <cstring>unnamed</cstring> diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index 96001349d..36dc89b3e 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -80,7 +80,7 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis base->deviceFilter->setListView(base->deviceTree); - setRootOnlyMsg(i18n("<b>Hardware settings are system wide, and requires administrator access</b><br>To alter the system's hardware settings, click on the \"Administrator Mode\" button below.")); + setRootOnlyMsg(i18n("<b>Hardware settings are system wide, and therefore require administrator access</b><br>To alter the system's hardware settings, click on the \"Administrator Mode\" button below.")); setUseRootOnlyMsg(true); TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h index 89652cd32..a7c9749a7 100644 --- a/kcontrol/hwmanager/hwmanager.h +++ b/kcontrol/hwmanager/hwmanager.h @@ -52,8 +52,7 @@ public: void load( bool useDefaults); void save(); void defaults(); - - int buttons(); + TQString quickHelp() const; k_dcop: diff --git a/kcontrol/hwmanager/hwmanagerbase.ui b/kcontrol/hwmanager/hwmanagerbase.ui index 4b14ff428..632ec2259 100644 --- a/kcontrol/hwmanager/hwmanagerbase.ui +++ b/kcontrol/hwmanager/hwmanagerbase.ui @@ -4,14 +4,6 @@ <property name="name"> <cstring>TDEHWManagerBase</cstring> </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>519</width> - <height>356</height> - </rect> - </property> <grid> <property name="name"> <cstring>unnamed</cstring> |