summaryrefslogtreecommitdiffstats
path: root/kcontrol/keys
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/keys')
-rw-r--r--kcontrol/keys/commandShortcuts.cpp20
-rw-r--r--kcontrol/keys/commandShortcuts.h2
-rw-r--r--kcontrol/keys/kde4.kksrc6
-rw-r--r--kcontrol/keys/keyconfig.cpp56
-rw-r--r--kcontrol/keys/keyconfig.h4
-rw-r--r--kcontrol/keys/main.cpp23
-rw-r--r--kcontrol/keys/main.h2
-rw-r--r--kcontrol/keys/modifiers.cpp20
-rw-r--r--kcontrol/keys/modifiers.h2
-rw-r--r--kcontrol/keys/shortcuts.cpp33
-rw-r--r--kcontrol/keys/shortcuts.h2
-rw-r--r--kcontrol/keys/treeview.cpp12
-rw-r--r--kcontrol/keys/treeview.h4
-rw-r--r--kcontrol/keys/trinity.kksrc6
-rw-r--r--kcontrol/keys/unix3.kksrc6
-rw-r--r--kcontrol/keys/win3.kksrc6
-rw-r--r--kcontrol/keys/win4.kksrc6
-rw-r--r--kcontrol/keys/wm3.kksrc6
18 files changed, 115 insertions, 101 deletions
diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp
index 4ae379a50..31e1b0500 100644
--- a/kcontrol/keys/commandShortcuts.cpp
+++ b/kcontrol/keys/commandShortcuts.cpp
@@ -84,8 +84,8 @@ void CommandShortcutsModule::initGUI()
"To edit, add or remove entries from this list use the "
"<a href=\"launchMenuEditor\">TDE menu editor</a>.</qt>"));
label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
- disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &)));
- connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor()));
+ disconnect(label, TQ_SIGNAL(linkClicked(const TQString &)), label, TQ_SLOT(openLink(const TQString &)));
+ connect(label, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SLOT(launchMenuEditor()));
mainLayout->addWidget(label);
m_tree = new AppTreeView(this, "appTreeView");
@@ -97,10 +97,10 @@ void CommandShortcutsModule::initGUI()
"currently defined on this system. Click to select a command to "
"assign a keyboard shortcut to. Complete management of these "
"entries can be done via the menu editor program."));
- connect(m_tree, TQT_SIGNAL(entrySelected(const TQString&, const TQString &, bool)),
- this, TQT_SLOT(commandSelected(const TQString&, const TQString &, bool)));
- connect(m_tree, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
- this, TQT_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int)));
+ connect(m_tree, TQ_SIGNAL(entrySelected(const TQString&, const TQString &, bool)),
+ this, TQ_SLOT(commandSelected(const TQString&, const TQString &, bool)));
+ connect(m_tree, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
+ this, TQ_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int)));
m_shortcutBox = new TQButtonGroup(i18n("Shortcut for Selected Command"), this);
mainLayout->addWidget(m_shortcutBox);
TQHBoxLayout* buttonLayout = new TQHBoxLayout(m_shortcutBox, KDialog::marginHint() * 2);
@@ -121,10 +121,10 @@ void CommandShortcutsModule::initGUI()
"to the currently selected command."));
buttonLayout->addSpacing(KDialog::spacingHint() * 2);
buttonLayout->addWidget(m_shortcutButton);
- connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)),
- this, TQT_SLOT(shortcutChanged(const TDEShortcut&)));
- connect(m_customRadio, TQT_SIGNAL(toggled(bool)), m_shortcutButton, TQT_SLOT(setEnabled(bool)));
- connect(m_noneRadio, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shortcutRadioToggled(bool)));
+ connect(m_shortcutButton, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)),
+ this, TQ_SLOT(shortcutChanged(const TDEShortcut&)));
+ connect(m_customRadio, TQ_SIGNAL(toggled(bool)), m_shortcutButton, TQ_SLOT(setEnabled(bool)));
+ connect(m_noneRadio, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(shortcutRadioToggled(bool)));
buttonLayout->addStretch(1);
}
diff --git a/kcontrol/keys/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h
index 54be5345b..9cb328f15 100644
--- a/kcontrol/keys/commandShortcuts.h
+++ b/kcontrol/keys/commandShortcuts.h
@@ -37,7 +37,7 @@ typedef TQPtrListIterator<AppTreeItem> treeItemListIterator;
class CommandShortcutsModule : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
CommandShortcutsModule( TQWidget *parent = 0, const char *name = 0 );
~CommandShortcutsModule();
diff --git a/kcontrol/keys/kde4.kksrc b/kcontrol/keys/kde4.kksrc
index 367bc41d6..a35eaafbd 100644
--- a/kcontrol/keys/kde4.kksrc
+++ b/kcontrol/keys/kde4.kksrc
@@ -75,8 +75,9 @@ Halt Computer=none
Halt without Confirmation=none
Kill Window=Win+Ctrl+Delete
Lock Session=Win+ScrollLock
-Logout=Win+Escape
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=Win+Escape
+Log Out Without Confirmation=none
Manually Invoke Action on Current Clipboard=Win+Ctrl+R
Mouse Emulation=none
Popup Launch Menu=Win+Menu
@@ -85,6 +86,7 @@ Reboot without Confirmation=none
Show Klipper Popup-Menu=Win+Ctrl+V
Show Taskmanager=Win+Ctrl+Pause
Show Window List=Win+0
+Suspend=XF86Sleep
Switch One Desktop Down=none
Switch One Desktop to the Left=none
Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index ee39447a1..1cf193fde 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -20,8 +20,8 @@
#include <kdebug.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
-#include <ksimpleconfig.h>
+#include <tdestandarddirs.h>
+#include <tdesimpleconfig.h>
#include <tdemessagebox.h>
#include <kseparator.h>
#include <dcopclient.h>
@@ -112,8 +112,8 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
//readSchemeNames();
sList->setCurrentItem( 0 );
- connect( sList, TQT_SIGNAL( highlighted( int ) ),
- TQT_SLOT( slotPreviewScheme( int ) ) );
+ connect( sList, TQ_SIGNAL( highlighted( int ) ),
+ TQ_SLOT( slotPreviewScheme( int ) ) );
TQLabel *label = new TQLabel( sList, i18n("&Key Scheme"), this );
@@ -124,12 +124,12 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
TQWhatsThis::add( sList, wtstr );
addBt = new TQPushButton( i18n("&Save Scheme..."), this );
- connect( addBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) );
+ connect( addBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) );
TQWhatsThis::add(addBt, i18n("Click here to add a new key bindings scheme. You will be prompted for a name."));
removeBt = new TQPushButton( i18n("&Remove Scheme"), this );
- removeBt->setEnabled(FALSE);
- connect( removeBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ) );
+ removeBt->setEnabled(false);
+ connect( removeBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ) );
TQWhatsThis::add( removeBt, i18n("Click here to remove the selected key bindings scheme. You can not"
" remove the standard system wide schemes, 'Current scheme' and 'TDE default'.") );
@@ -143,7 +143,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
if( !KKeySequence::keyboardHasMetaKey() )
preferMetaBt->setEnabled( false );
preferMetaBt->setChecked( KKeySequence::useFourModifierKeys() );
- connect( preferMetaBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotPreferMeta()) );
+ connect( preferMetaBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotPreferMeta()) );
TQWhatsThis::add( preferMetaBt, i18n("If your keyboard has a Meta key, but you would "
"like TDE to prefer the 3-modifier configuration defaults, then this option "
"should be unchecked.") );
@@ -153,7 +153,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
KSeparator* line = new KSeparator( KSeparator::HLine, this );
kc = new KeyChooserSpec( actions, this, isGlobal );
- connect( kc, TQT_SIGNAL(keyChange()), this, TQT_SLOT(slotKeyChange()) );
+ connect( kc, TQ_SIGNAL(keyChange()), this, TQ_SLOT(slotKeyChange()) );
readScheme();
@@ -206,12 +206,12 @@ void KKeyModule::load()
kc->commitChanges();
actions.writeActions( KeySet, 0, true, true );
if ( KeyType == "global" ) {
- if ( !kapp->dcopClient()->isAttached() )
- kapp->dcopClient()->attach();
+ if ( !tdeApp->dcopClient()->isAttached() )
+ tdeApp->dcopClient()->attach();
// TODO: create a reconfigureKeys() method.
- kapp->dcopClient()->send("twin", "", "reconfigure()", "");
- kapp->dcopClient()->send("kdesktop", "", "configure()", "");
- kapp->dcopClient()->send("kicker", "Panel", "configure()", "");
+ tdeApp->dcopClient()->send("twin", "", "reconfigure()", "");
+ tdeApp->dcopClient()->send("kdesktop", "", "configure()", "");
+ tdeApp->dcopClient()->send("kicker", "Panel", "configure()", "");
}
}*/
@@ -258,7 +258,7 @@ void KKeyModule::slotKeyChange()
/*void KKeyModule::slotSave( )
{
- KSimpleConfig config(*sFileList->at( sList->currentItem() ) );
+ TDESimpleConfig config(*sFileList->at( sList->currentItem() ) );
// global=true is necessary in order to
// let both 'Global Shortcuts' and 'Shortcut Sequences' be
// written to the same scheme file.
@@ -281,7 +281,7 @@ void KKeyModule::readScheme( int index )
else {
TDEConfigBase* config = 0;
if( index == 0 ) config = new TDEConfig( "kdeglobals" );
- //else config = new KSimpleConfig( *sFileList->at( index ), true );
+ //else config = new TDESimpleConfig( *sFileList->at( index ), true );
actions.readActions( (index == 0) ? KeySet : KeyScheme, config );
kc->listSync();
@@ -303,7 +303,7 @@ void KKeyModule::readScheme( int index )
do {
- nameValid = TRUE;
+ nameValid = true;
if ( ss.exec() ) {
sName = ss.nameLine->text();
@@ -354,10 +354,10 @@ void KKeyModule::readScheme( int index )
}
} else return;
- } while ( nameValid == FALSE );
+ } while ( nameValid == false );
- disconnect( sList, TQT_SIGNAL( highlighted( int ) ), this,
- TQT_SLOT( slotPreviewScheme( int ) ) );
+ disconnect( sList, TQ_SIGNAL( highlighted( int ) ), this,
+ TQ_SLOT( slotPreviewScheme( int ) ) );
TQString kksPath = TDEGlobal::dirs()->saveLocation("data", "kcmkeys/");
@@ -394,8 +394,8 @@ void KKeyModule::readScheme( int index )
sList->setCurrentItem( exists );
}
- KSimpleConfig *config =
- new KSimpleConfig( sFile );
+ TDESimpleConfig *config =
+ new TDESimpleConfig( sFile );
config->setGroup( KeyScheme );
config->writeEntry( "Name", sName );
@@ -403,8 +403,8 @@ void KKeyModule::readScheme( int index )
slotSave();
- connect( sList, TQT_SIGNAL( highlighted( int ) ), this,
- TQT_SLOT( slotPreviewScheme( int ) ) );
+ connect( sList, TQ_SIGNAL( highlighted( int ) ), this,
+ TQ_SLOT( slotPreviewScheme( int ) ) );
slotPreviewScheme( sList->currentItem() );
}*/
@@ -418,9 +418,9 @@ void KKeyModule::readScheme( int index )
if ( indx < nSysSchemes ||
(*sFileList->at(indx)).contains( "/global-" ) ||
(*sFileList->at(indx)).contains( "/app-" ) ) {
- removeBt->setEnabled( FALSE );
+ removeBt->setEnabled( false );
} else {
- removeBt->setEnabled( TRUE );
+ removeBt->setEnabled( true );
}
}*/
@@ -449,7 +449,7 @@ void KKeyModule::readScheme( int index )
//if( r.search( *it ) != -1 )
// continue;
- KSimpleConfig config( *it, true );
+ TDESimpleConfig config( *it, true );
// TODO: Put 'Name' in "Settings" group
config.setGroup( KeyScheme );
TQString str = config.readEntry( "Name" );
@@ -496,7 +496,7 @@ void KKeyModule::init()
keys->readActions( "Global Keys" );
{
- KSimpleConfig cfg( "kdeglobals" );
+ TDESimpleConfig cfg( "kdeglobals" );
cfg.deleteGroup( "Global Keys" );
}
diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h
index f442a2c31..4da3f16b2 100644
--- a/kcontrol/keys/keyconfig.h
+++ b/kcontrol/keys/keyconfig.h
@@ -22,7 +22,7 @@ class KeyChooserSpec;
class KKeyModule : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
TDEAccelActions actions;
//TDEAccelActions dict;
@@ -77,7 +77,7 @@ protected:
class KeyChooserSpec : public KKeyChooser
{
- Q_OBJECT
+ TQ_OBJECT
public:
KeyChooserSpec( TDEAccelActions& actions, TQWidget* parent,
bool bGlobal );
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index d002b667f..b54ffb5cd 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -25,7 +25,8 @@
#include <kdebug.h>
#include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
+#include <dcopref.h>
#include "commandShortcuts.h"
#include "main.h"
@@ -75,16 +76,16 @@ void KeyModule::initGUI()
m_pShortcuts = new ShortcutsModule( this );
m_pTab->addTab( m_pShortcuts, i18n("Shortcut Schemes") );
- connect( m_pShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
+ connect( m_pShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
m_pCommandShortcuts = new CommandShortcutsModule ( this );
m_pTab->addTab( m_pCommandShortcuts, i18n("Command Shortcuts") );
- connect( m_pCommandShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
- connect( m_pTab, TQT_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQT_SLOT(showing(TQWidget*)) );
+ connect( m_pCommandShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
+ connect( m_pTab, TQ_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQ_SLOT(showing(TQWidget*)) );
m_pModifiers = new ModifiersModule( this );
m_pTab->addTab( m_pModifiers, i18n("Modifier Keys") );
- connect( m_pModifiers, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
+ connect( m_pModifiers, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
}
void KeyModule::load()
@@ -146,7 +147,7 @@ TQString KeyModule::handbookSection() const
extern "C"
{
- KDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/)
+ TDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/)
{
// What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15
TDEGlobal::locale()->insertCatalogue("twin");
@@ -155,7 +156,7 @@ extern "C"
return new KeyModule(parent, "kcmkeys");
}
- KDE_EXPORT void initModifiers()
+ TDE_EXPORT void initModifiers()
{
kdDebug(125) << "KeyModule::initModifiers()" << endl;
@@ -165,7 +166,7 @@ extern "C"
ModifiersModule::setupMacModifierKeys();
}
- KDE_EXPORT void init_keys()
+ TDE_EXPORT void init_keys()
{
kdDebug(125) << "KeyModule::init()\n";
@@ -181,9 +182,9 @@ extern "C"
kdDebug(125) << "KeyModule::init() - Load Included Bindings\n";
// this should match the included files above
#define NOSLOTS
-#define SHIFT Qt::SHIFT
-#define CTRL Qt::CTRL
-#define ALT Qt::ALT
+#define SHIFT TQt::SHIFT
+#define CTRL TQt::CTRL
+#define ALT TQt::ALT
#include "../../klipper/klipperbindings.cpp"
#include "../../twin/twinbindings.cpp"
#define KICKER_ALL_BINDINGS
diff --git a/kcontrol/keys/main.h b/kcontrol/keys/main.h
index 281b2d37a..1830438a9 100644
--- a/kcontrol/keys/main.h
+++ b/kcontrol/keys/main.h
@@ -33,7 +33,7 @@ class ModifiersModule;
class KeyModule : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KeyModule( TQWidget *parent, const char *name );
~KeyModule();
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 39dfb7010..f8c887c45 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -116,7 +116,7 @@ void ModifiersModule::save()
if( bMacSwap )
setupMacModifierKeys();
else
- kapp->tdeinitExec("kxkb");
+ tdeApp->tdeinitExec("kxkb");
m_bMacSwapOrig = bMacSwap;
updateWidgets();
}
@@ -172,7 +172,7 @@ void ModifiersModule::initGUI()
TQGridLayout* pLayoutTop = new TQGridLayout( this, 6, 2, KDialog::marginHint() );
pLayoutTop->setColStretch( 1, 1 );
- TQGroupBox* pGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("TDE Modifiers"), this );
+ TQGroupBox* pGroup = new TQGroupBox( 2, TQt::Horizontal, i18n("TDE Modifiers"), this );
pLayoutTop->addWidget( pGroup, 0, 0 );
TQLabel* plbl = new TQLabel( i18n("Modifier"), pGroup );
@@ -183,13 +183,13 @@ void ModifiersModule::initGUI()
plbl = new TQLabel( i18n("X11-Mod"), pGroup );
plbl->setFont( font );
- new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Shift"), pGroup );
+ new TQLabel( i18n("TQAccel", "Shift"), pGroup );
new TQLabel( "shift", pGroup );
- m_plblCtrl = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl"), pGroup );
+ m_plblCtrl = new TQLabel( i18n("TQAccel", "Ctrl"), pGroup );
new TQLabel( "control", pGroup );
- m_plblAlt = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt"), pGroup );
+ m_plblAlt = new TQLabel( i18n("TQAccel", "Alt"), pGroup );
new TQLabel( "mod1", pGroup );
m_plblWin = new TQLabel( i18n("Win"), pGroup );
@@ -207,7 +207,7 @@ void ModifiersModule::initGUI()
m_pchkMacKeyboard = new TQCheckBox( i18n("Macintosh keyboard"), this );
m_pchkMacKeyboard->setChecked( m_bMacKeyboardOrig );
- connect( m_pchkMacKeyboard, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacKeyboardClicked()) );
+ connect( m_pchkMacKeyboard, TQ_SIGNAL(clicked()), TQ_SLOT(slotMacKeyboardClicked()) );
pLayoutTop->addWidget( m_pchkMacKeyboard, 1, 0 );
m_pchkMacSwap = new TQCheckBox( i18n("MacOS-style modifier usage"), this );
@@ -220,13 +220,13 @@ void ModifiersModule::initGUI()
"<b>Command</b> will be used for application and console commands, "
"<b>Option</b> as a command modifier and for navigating menus and dialogs, "
"and <b>Control</b> for window manager commands.") );
- connect( m_pchkMacSwap, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacSwapClicked()) );
+ connect( m_pchkMacSwap, TQ_SIGNAL(clicked()), TQ_SLOT(slotMacSwapClicked()) );
pLayoutTop->addWidget( m_pchkMacSwap, 2, 0 );
//------------------
pLayoutTop->addRowSpacing( 3, KDialog::spacingHint() * 3 );
- pGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this );
+ pGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("X Modifier Mapping"), this );
pLayoutTop->addWidget( pGroup, 4, 0 );
m_plstXMods = new TDEListView( pGroup );
@@ -286,8 +286,8 @@ void ModifiersModule::updateWidgets()
}
m_pchkMacSwap->setEnabled( true );
} else {
- m_plblCtrl->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl") );
- m_plblAlt->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt") );
+ m_plblCtrl->setText( i18n("TQAccel", "Ctrl") );
+ m_plblAlt->setText( i18n("TQAccel", "Alt") );
m_plblWin->setText( i18n("Win") );
m_pchkMacSwap->setEnabled( false );
}
diff --git a/kcontrol/keys/modifiers.h b/kcontrol/keys/modifiers.h
index b600bfafb..64b73fa5b 100644
--- a/kcontrol/keys/modifiers.h
+++ b/kcontrol/keys/modifiers.h
@@ -10,7 +10,7 @@ class TDEListView;
class ModifiersModule : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ModifiersModule( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index e7f599dda..c225e5f68 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -39,8 +39,9 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <tdeshortcutlist.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
+#include <dcopref.h>
ShortcutsModule::ShortcutsModule( TQWidget *parent, const char *name )
: TQWidget( parent, name )
@@ -139,21 +140,21 @@ void ShortcutsModule::initGUI()
pGroup->hide();
m_prbPre = new TQRadioButton( "", this );
- connect( m_prbPre, TQT_SIGNAL(clicked()), TQT_SLOT(slotSchemeCur()) );
+ connect( m_prbPre, TQ_SIGNAL(clicked()), TQ_SLOT(slotSchemeCur()) );
pGroup->insert( m_prbPre );
pHLayout->addWidget( m_prbPre );
m_pcbSchemes = new KComboBox( this );
m_pcbSchemes->setMinimumWidth( 100 );
m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
- connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) );
+ connect( m_pcbSchemes, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectScheme(int)) );
pHLayout->addWidget( m_pcbSchemes );
pHLayout->addSpacing( KDialog::marginHint() );
m_pbtnRemove = new TQPushButton( i18n("&Remove"), this );
m_pbtnRemove->setEnabled( false );
- connect( m_pbtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveScheme()) );
+ connect( m_pbtnRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveScheme()) );
TQWhatsThis::add( m_pbtnRemove, i18n("Click here to remove the selected key bindings scheme. You cannot"
" remove the standard system-wide schemes 'Current scheme' and 'TDE default'.") );
pHLayout->addWidget( m_pbtnRemove );
@@ -168,7 +169,7 @@ void ShortcutsModule::initGUI()
m_pbtnSave = new TQPushButton( i18n("&Save..."), this );
m_pbtnSave->setEnabled( false );
TQWhatsThis::add( m_pbtnSave, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.") );
- connect( m_pbtnSave, TQT_SIGNAL(clicked()), TQT_SLOT(slotSaveSchemeAs()) );
+ connect( m_pbtnSave, TQ_SIGNAL(clicked()), TQ_SLOT(slotSaveSchemeAs()) );
pHLayout->addWidget( m_pbtnSave );
pHLayout->addStretch( 1 );
@@ -196,20 +197,20 @@ void ShortcutsModule::initGUI()
m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() );
m_useRmWinKeys->setChecked( m_bUseRmWinKeys );
pVLayout->addWidget( m_useRmWinKeys, 1, 0 );
- connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) );
+ connect( m_useRmWinKeys, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseRmWinKeysClicked()) );
}
m_pTab->addTab( m_pkcGeneral, i18n("&Global Shortcuts") );
- connect( m_pkcGeneral, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
+ connect( m_pkcGeneral, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) );
m_pListSequence = new TDEAccelShortcutList( m_actionsSequence, true );
m_pkcSequence = new KKeyChooser( m_pListSequence, this, KKeyChooser::Global, false );
m_pTab->addTab( m_pkcSequence, i18n("Shortcut Se&quences") );
- connect( m_pkcSequence, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
+ connect( m_pkcSequence, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) );
m_pListApplication = new TDEStdAccel::ShortcutList;
m_pkcApplication = new KKeyChooser( m_pListApplication, this, KKeyChooser::Standard, false );
m_pTab->addTab( m_pkcApplication, i18n("App&lication Shortcuts") );
- connect( m_pkcApplication, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
+ connect( m_pkcApplication, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) );
kdDebug(125) << "G-----------" << endl;
readSchemeNames();
@@ -281,7 +282,7 @@ void ShortcutsModule::readSchemeNames()
//if( r.search( *it ) != -1 )
// continue;
- KSimpleConfig config( *it, true );
+ TDESimpleConfig config( *it, true );
config.setGroup( "Settings" );
TQString str = config.readEntry( "Name" );
@@ -323,7 +324,7 @@ void ShortcutsModule::slotSelectScheme( int )
m_pkcSequence->syncToConfig( "Global Shortcuts", 0, true );
m_pkcApplication->syncToConfig( "Shortcuts", 0, false );
} else {
- KSimpleConfig config( sFilename );
+ TDESimpleConfig config( sFilename );
config.setGroup( "Settings" );
//m_sBaseSchemeFile = config.readEntry( "Name" );
@@ -404,7 +405,7 @@ void ShortcutsModule::slotSaveSchemeAs()
return;
} while( !bNameValid );
- disconnect( m_pcbSchemes, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectScheme(int)) );
+ disconnect( m_pcbSchemes, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSelectScheme(int)) );
TQString kksPath = TDEGlobal::dirs()->saveLocation( "data", "kcmkeys/" );
@@ -426,7 +427,7 @@ void ShortcutsModule::slotSaveSchemeAs()
m_pcbSchemes->setCurrentItem( iScheme );
}
- KSimpleConfig *config = new KSimpleConfig( sFile );
+ TDESimpleConfig *config = new TDESimpleConfig( sFile );
config->setGroup( "Settings" );
config->writeEntry( "Name", sName );
@@ -434,14 +435,14 @@ void ShortcutsModule::slotSaveSchemeAs()
saveScheme();
- connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) );
+ connect( m_pcbSchemes, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectScheme(int)) );
slotSelectScheme();
}
void ShortcutsModule::saveScheme()
{
TQString sFilename = m_rgsSchemeFiles[ m_pcbSchemes->currentItem() ];
- KSimpleConfig config( sFilename );
+ TDESimpleConfig config( sFilename );
m_pkcGeneral->commitChanges();
m_pkcSequence->commitChanges();
diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h
index c1f1b2822..2ffc0e68f 100644
--- a/kcontrol/keys/shortcuts.h
+++ b/kcontrol/keys/shortcuts.h
@@ -35,7 +35,7 @@
class ShortcutsModule : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ShortcutsModule( TQWidget *parent = 0, const char *name = 0 );
~ShortcutsModule();
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 36d0e3bf4..7cb5de9b5 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -25,7 +25,7 @@
#include <tqstringlist.h>
#include <tqcursor.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <kiconloader.h>
#include <kservicegroup.h>
@@ -109,11 +109,11 @@ AppTreeView::AppTreeView( TQWidget *parent, const char *name )
addColumn(i18n("Shortcut"));
addColumn(i18n("Alternate"));
- connect(this, TQT_SIGNAL(clicked( TQListViewItem* )),
- TQT_SLOT(itemSelected( TQListViewItem* )));
+ connect(this, TQ_SIGNAL(clicked( TQListViewItem* )),
+ TQ_SLOT(itemSelected( TQListViewItem* )));
- connect(this,TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
- TQT_SLOT(itemSelected( TQListViewItem* )));
+ connect(this,TQ_SIGNAL(selectionChanged ( TQListViewItem * )),
+ TQ_SLOT(itemSelected( TQListViewItem* )));
}
AppTreeView::~AppTreeView()
@@ -122,7 +122,7 @@ AppTreeView::~AppTreeView()
void AppTreeView::fill()
{
- TQApplication::setOverrideCursor(Qt::WaitCursor);
+ TQApplication::setOverrideCursor(TQt::WaitCursor);
clear();
fillBranch(TQString::null, 0);
TQApplication::restoreOverrideCursor();
diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h
index 4da6d2351..a61cf591a 100644
--- a/kcontrol/keys/treeview.h
+++ b/kcontrol/keys/treeview.h
@@ -26,7 +26,7 @@
class TQPopupMenu;
class TDEActionCollection;
-class KDesktopFile;
+class TDEDesktopFile;
class AppTreeItem : public TDEListViewItem
{
@@ -61,7 +61,7 @@ private:
class AppTreeView : public TDEListView
{
friend class AppTreeItem;
- Q_OBJECT
+ TQ_OBJECT
public:
AppTreeView(TQWidget *parent=0, const char *name=0);
~AppTreeView();
diff --git a/kcontrol/keys/trinity.kksrc b/kcontrol/keys/trinity.kksrc
index 57681b60f..2339b9186 100644
--- a/kcontrol/keys/trinity.kksrc
+++ b/kcontrol/keys/trinity.kksrc
@@ -75,8 +75,9 @@ Halt Computer=none
Halt without Confirmation=none
Kill Window=Alt+Ctrl+Escape
Lock Session=Alt+Ctrl+L
-Logout=Alt+Ctrl+Delete
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=Alt+Ctrl+Delete
+Log Out Without Confirmation=none
Manually Invoke Action on Current Clipboard=Alt+Ctrl+R
Mouse Emulation=Alt+F12
Popup Launch Menu=Alt+F1
@@ -86,6 +87,7 @@ Show Klipper Popup-Menu=Alt+Ctrl+V
Show Taskmanager=Ctrl+Escape
Show Window List=Alt+F5
Start Screen Saver=Alt+Ctrl+S
+Suspend=XF86Sleep
Switch One Desktop Down=none
Switch One Desktop to the Left=none
Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/unix3.kksrc b/kcontrol/keys/unix3.kksrc
index 8ac722ec6..de091abc7 100644
--- a/kcontrol/keys/unix3.kksrc
+++ b/kcontrol/keys/unix3.kksrc
@@ -81,8 +81,9 @@ Halt Computer=none
Halt without Confirmation=none
Kill Window=Alt+F9
Lock Session=Alt+Ctrl+L
-Logout=Alt+Ctrl+Delete
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=Alt+Ctrl+Delete
+Log Out Without Confirmation=none
Manually Invoke Action on Current Clipboard=Alt+Ctrl+R
Mouse Emulation=Alt+F12
Popup Launch Menu=Alt+F1
@@ -91,6 +92,7 @@ Reboot without Confirmation=none
Show Klipper Popup-Menu=none
Show Taskmanager=Ctrl+Escape
Show Window List=none
+Suspend=XF86Sleep
Switch One Desktop Down=none
Switch One Desktop to the Left=none
Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/win3.kksrc b/kcontrol/keys/win3.kksrc
index 926f83670..a7ae3adbc 100644
--- a/kcontrol/keys/win3.kksrc
+++ b/kcontrol/keys/win3.kksrc
@@ -81,8 +81,9 @@ Halt Computer=none
Halt without Confirmation=none
Kill Window=none
Lock Session=none
-Logout=none
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=none
+Log Out Without Confirmation=none
Manually Invoke Action on Current Clipboard=none
Mouse Emulation=none
Popup Launch Menu=Ctrl+Escape
@@ -91,6 +92,7 @@ Reboot without Confirmation=none
Show Klipper Popup-Menu=none
Show Taskmanager=Alt+Ctrl+Delete
Show Window List=none
+Suspend=XF86Sleep
Switch One Desktop Down=none
Switch One Desktop to the Left=none
Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/win4.kksrc b/kcontrol/keys/win4.kksrc
index 1abb69313..3c53ecd25 100644
--- a/kcontrol/keys/win4.kksrc
+++ b/kcontrol/keys/win4.kksrc
@@ -81,8 +81,9 @@ Halt Computer=none
Halt without Confirmation=none
Kill Window=none
Lock Session=none
-Logout=none
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=none
+Log Out Without Confirmation=none
Manually Invoke Action on Current Clipboard=none
Mouse Emulation=none
Popup Launch Menu=Ctrl+Escape
@@ -91,6 +92,7 @@ Reboot without Confirmation=none
Show Klipper Popup-Menu=none
Show Taskmanager=Alt+Ctrl+Delete
Show Window List=none
+Suspend=XF86Sleep
Switch One Desktop Down=none
Switch One Desktop to the Left=none
Switch One Desktop to the Right=none
diff --git a/kcontrol/keys/wm3.kksrc b/kcontrol/keys/wm3.kksrc
index 6c6ef61e5..70abfbf94 100644
--- a/kcontrol/keys/wm3.kksrc
+++ b/kcontrol/keys/wm3.kksrc
@@ -71,8 +71,9 @@ Halt Computer=none
Halt without Confirmation=none
Kill Window=Alt+Ctrl+Escape
Lock Session=Alt+Ctrl+L
-Logout=Alt+Ctrl+Delete
-Logout without Confirmation=none
+Lock Session (Hotkey)=XF86ScreenSaver
+Log Out=Alt+Ctrl+Delete
+Log Out Without Confirmation=none
Manually Invoke Action on Current Clipboard=Alt+Ctrl+R
Mouse Emulation=Alt+F12
Popup Launch Menu=Alt+F1
@@ -81,6 +82,7 @@ Reboot without Confirmation=none
Show Klipper Popup-Menu=Alt+Ctrl+V
Show Taskmanager=Ctrl+Escape
Show Window List=Alt+F5
+Suspend=XF86Sleep
Switch One Desktop Down=none
Switch One Desktop to the Left=none
Switch One Desktop to the Right=none
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 07:21:08 +0000