summaryrefslogtreecommitdiffstats
path: root/kcontrol/konq
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/konq')
-rw-r--r--kcontrol/konq/behaviour.cpp34
-rw-r--r--kcontrol/konq/behaviour.h3
-rw-r--r--kcontrol/konq/browser.cpp12
-rw-r--r--kcontrol/konq/browser.h2
-rw-r--r--kcontrol/konq/desktop.cpp19
-rw-r--r--kcontrol/konq/desktop.h2
-rw-r--r--kcontrol/konq/desktopbehavior.ui294
-rw-r--r--kcontrol/konq/desktopbehavior_impl.cpp78
-rw-r--r--kcontrol/konq/desktopbehavior_impl.h10
-rw-r--r--kcontrol/konq/fontopts.cpp66
-rw-r--r--kcontrol/konq/fontopts.h2
-rw-r--r--kcontrol/konq/main.cpp16
-rw-r--r--kcontrol/konq/previews.cpp6
-rw-r--r--kcontrol/konq/previews.h2
-rw-r--r--kcontrol/konq/rootopts.cpp28
-rw-r--r--kcontrol/konq/rootopts.h2
16 files changed, 391 insertions, 185 deletions
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index d662d6af7..55eb642fe 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -66,13 +66,13 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
cbNewWin = new TQCheckBox(i18n("Open folders in separate &windows"), vbox);
TQWhatsThis::add( cbNewWin, i18n("If this option is checked, Konqueror will open a new window when "
"you open a folder, rather than showing that folder's contents in the current window."));
- connect(cbNewWin, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
- connect(cbNewWin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateWinPixmap(bool)));
+ connect(cbNewWin, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+ connect(cbNewWin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateWinPixmap(bool)));
// ----
cbListProgress = new TQCheckBox( i18n( "&Show network operations in a single window" ), vbox );
- connect(cbListProgress, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(cbListProgress, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
TQWhatsThis::add( cbListProgress, i18n("Checking this option will group the"
" progress information for all network file transfers into a single window"
@@ -83,7 +83,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
// ----
cbShowArchivesAsFolders = new TQCheckBox( i18n( "Show archived &files as folders" ), vbox );
- connect(cbShowArchivesAsFolders, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(cbShowArchivesAsFolders, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
TQWhatsThis::add( cbShowArchivesAsFolders, i18n("Checking this option will list archived"
" files as folders when using tree view.") );
@@ -92,16 +92,16 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
// --
cbShowTips = new TQCheckBox( i18n( "Show file &tips" ), vbox );
- connect(cbShowTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(cbShowTips, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
TQWhatsThis::add( cbShowTips, i18n("Here you can control if, when moving the mouse over a file, you want to see a "
"small popup window with additional information about that file."
"This feature requires 'Enable tooltips' in KControl, Appearance & Themes, Style."));
- connect(cbShowTips, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShowTips(bool)));
+ connect(cbShowTips, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotShowTips(bool)));
/*
- //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), sbToolTip, TQT_SLOT(setEnabled(bool)));
- //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), fileTips, TQT_SLOT(setEnabled(bool)));
+ //connect(cbShowTips, TQ_SIGNAL(toggled(bool)), sbToolTip, TQ_SLOT(setEnabled(bool)));
+ //connect(cbShowTips, TQ_SIGNAL(toggled(bool)), fileTips, TQ_SLOT(setEnabled(bool)));
fileTips->setBuddy(sbToolTip);
TQString tipstr = i18n("If you move the mouse over a file, you usually see a small popup window that shows some "
"additional information about that file. Here, you can set how many items of information "
@@ -116,7 +116,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview );
- connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(cbShowPreviewsInTips, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
TQWhatsThis::add( cbShowPreviewsInTips, i18n("Here you can control if you want the "
"popup window to contain a larger preview for the file, when moving the mouse over it."));
@@ -124,7 +124,12 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
cbRenameDirectlyIcon = new TQCheckBox(i18n("Rename icons in&line"), vbox);
TQWhatsThis::add(cbRenameDirectlyIcon, i18n("Checking this option will allow files to be "
"renamed by clicking directly on the icon name. "));
- connect(cbRenameDirectlyIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(cbRenameDirectlyIcon, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+
+ cbDoubleClickMoveToParent = new TQCheckBox(i18n("Double click on empty area to move to parent folder"), vbox);
+ TQWhatsThis::add(cbDoubleClickMoveToParent, i18n("When this option is enabled, double clicking an "
+ "empty area will navigate to the parent folder."));
+ connect(cbDoubleClickMoveToParent, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
TQHBoxLayout *hlay = new TQHBoxLayout( lay );
@@ -135,7 +140,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
homeURL->setMode(KFile::Directory);
homeURL->setCaption(i18n("Select Home Folder"));
hlay->addWidget( homeURL );
- connect(homeURL, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(homeURL, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
label->setBuddy(homeURL);
TQString homestr = i18n("This is the URL (e.g. a folder or a web page) where "
@@ -148,7 +153,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
cbShowDeleteCommand = new TQCheckBox( i18n( "Show 'Delete' context me&nu entries which bypass the trashcan" ), this );
lay->addWidget( cbShowDeleteCommand );
- connect(cbShowDeleteCommand, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect(cbShowDeleteCommand, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
TQWhatsThis::add( cbShowDeleteCommand, i18n("Check this if you want 'Delete' menu commands to be displayed "
"on the desktop and in the file manager's context menus. "
@@ -164,7 +169,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget
" <li><em>Delete:</em> simply deletes the file.</li>"
" </li></ul>") );
- connect(bg, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( changed() ));
+ connect(bg, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( changed() ));
cbMoveToTrash = new TQCheckBox( i18n("&Move to trash"), bg );
@@ -213,6 +218,8 @@ void KBehaviourOptions::load( bool useDefaults )
cbRenameDirectlyIcon->setChecked( g_pConfig->readBoolEntry("RenameIconDirectly", DEFAULT_RENAMEICONDIRECTLY ) );
+ cbDoubleClickMoveToParent->setChecked(g_pConfig->readBoolEntry("DoubleClickMoveToParent", true));
+
TDEConfig globalconfig("kdeglobals", true, false);
globalconfig.setGroup( "KDE" );
cbShowDeleteCommand->setChecked( globalconfig.readBoolEntry("ShowDeleteCommand", false) );
@@ -254,6 +261,7 @@ void KBehaviourOptions::save()
// g_pConfig->writeEntry( "FileTipsItems", sbToolTip->value() );
g_pConfig->writeEntry( "RenameIconDirectly", cbRenameDirectlyIcon->isChecked());
+ g_pConfig->writeEntry( "DoubleClickMoveToParent", cbDoubleClickMoveToParent->isChecked());
TDEConfig sidebarconfig("konqsidebartng.rc");
sidebarconfig.setGroup( "" );
diff --git a/kcontrol/konq/behaviour.h b/kcontrol/konq/behaviour.h
index bb6421be3..ebb7d8511 100644
--- a/kcontrol/konq/behaviour.h
+++ b/kcontrol/konq/behaviour.h
@@ -35,7 +35,7 @@ class KURLRequester;
class KBehaviourOptions : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KBehaviourOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
~KBehaviourOptions();
@@ -68,6 +68,7 @@ private:
TQCheckBox *cbShowTips;
TQCheckBox *cbShowPreviewsInTips;
TQCheckBox *cbRenameDirectlyIcon;
+ TQCheckBox *cbDoubleClickMoveToParent;
TQCheckBox *cbMoveToTrash;
TQCheckBox *cbDelete;
diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp
index 49587f2dc..4a8496eac 100644
--- a/kcontrol/konq/browser.cpp
+++ b/kcontrol/konq/browser.cpp
@@ -57,14 +57,14 @@ KBrowserOptions::KBrowserOptions(TDEConfig *config, TQString group, TQWidget *pa
tab->addTab(kuick, i18n("&Quick Copy && Move"));
}
- connect(appearance, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
- connect(behavior, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
- connect(previews, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+ connect(appearance, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
+ connect(behavior, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
+ connect(previews, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
if (kuick)
- connect(kuick, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
+ connect(kuick, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool)));
- connect(tab, TQT_SIGNAL(currentChanged(TQWidget *)),
- this, TQT_SIGNAL(quickHelpChanged()));
+ connect(tab, TQ_SIGNAL(currentChanged(TQWidget *)),
+ this, TQ_SIGNAL(quickHelpChanged()));
m_tab = tab;
}
diff --git a/kcontrol/konq/browser.h b/kcontrol/konq/browser.h
index 0e0cee35c..1cb49eb02 100644
--- a/kcontrol/konq/browser.h
+++ b/kcontrol/konq/browser.h
@@ -29,7 +29,7 @@ class TQTabWidget;
class KBrowserOptions : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KBrowserOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index 973d94047..6ea6178db 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -1,4 +1,3 @@
-// -*- c-basic-offset: 2 -*-
/**
* Copyright (c) 2000 Matthias Elter <elter@kde.org>
*
@@ -40,7 +39,7 @@
extern "C"
{
- KDE_EXPORT TDECModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/)
+ TDE_EXPORT TDECModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/)
{
return new KDesktopConfig(parent, "kcmkonq");
}
@@ -71,8 +70,8 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
TQLabel *label = new TQLabel(i18n("N&umber of desktops: "), number_group);
_numInput = new KIntNumInput(4, number_group);
_numInput->setRange(1, maxDesktops, 1, true);
- connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
- connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
+ connect(_numInput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
+ connect(_numInput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT( changed() ));
label->setBuddy( _numInput );
TQString wtstr = i18n( "Here you can set how many virtual desktops you want on your TDE desktop. Move the slider to change the value." );
TQWhatsThis::add( label, wtstr );
@@ -87,7 +86,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
// name group
TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this);
- name_group->setColumnLayout(4, Qt::Horizontal);
+ name_group->setColumnLayout(4, TQt::Horizontal);
for(int i = 0; i < (maxDesktops/2); i++)
{
@@ -100,10 +99,10 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
TQWhatsThis::add( _nameLabel[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) );
TQWhatsThis::add( _nameInput[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) );
- connect(_nameInput[i], TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT( changed() ));
- connect(_nameInput[i+(maxDesktops/2)], TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT( changed() ));
+ connect(_nameInput[i], TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT( changed() ));
+ connect(_nameInput[i+(maxDesktops/2)], TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT( changed() ));
}
for(int i = 1; i < maxDesktops; i++)
@@ -112,7 +111,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
layout->addWidget(name_group);
_wheelOption = new TQCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this);
- connect(_wheelOption,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+ connect(_wheelOption,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() ));
layout->addWidget(_wheelOption);
layout->addStretch(1);
diff --git a/kcontrol/konq/desktop.h b/kcontrol/konq/desktop.h
index b7a05c3bc..9bdb8cb59 100644
--- a/kcontrol/konq/desktop.h
+++ b/kcontrol/konq/desktop.h
@@ -32,7 +32,7 @@ static const int maxDesktops = 20;
class KDesktopConfig : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDesktopConfig(TQWidget *parent = 0L, const char *name = 0L);
diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui
index c247ab354..703f88e95 100644
--- a/kcontrol/konq/desktopbehavior.ui
+++ b/kcontrol/konq/desktopbehavior.ui
@@ -33,79 +33,243 @@
<attribute name="title">
<string>General</string>
</attribute>
- <grid>
+ <vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="TQCheckBox" row="0" column="0">
+ <widget class="TQGroupBox">
<property name="name">
- <cstring>iconsEnabledBox</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>&amp;Show icons on desktop</string>
- </property>
- <property name="whatsThis" stdset="0">
- <string>Uncheck this option if you do not want to have icons on the desktop. Without icons the desktop will be somewhat faster but you will no longer be able to drag files to the desktop.</string>
+ <cstring>iconsGroupBox</cstring>
</property>
- </widget>
- <widget class="TQLayoutWidget" row="1" column="0">
- <property name="name">
- <cstring>layout1</cstring>
+ <property name="title">
+ <string>Desktop Icons</string>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <spacer>
+ <vbox>
+ <widget class="TQCheckBox">
<property name="name">
- <cstring>spacer3</cstring>
+ <cstring>iconsEnabledBox</cstring>
</property>
- <property name="orientation">
- <enum>Horizontal</enum>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="sizeType">
- <enum>Fixed</enum>
+ <property name="text">
+ <string>&amp;Show icons on desktop</string>
</property>
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>0</height>
- </size>
+ <property name="whatsThis" stdset="0">
+ <string>Uncheck this option if you do not want to have icons on the desktop. Without icons the desktop will be somewhat faster but you will no longer be able to drag files to the desktop.</string>
</property>
- </spacer>
+ </widget>
+ <widget class="TQLayoutWidget">
+ <property name="name">
+ <cstring>layout1</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <spacer>
+ <property name="name">
+ <cstring>spacer1</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="TQCheckBox">
+ <property name="name">
+ <cstring>vrootBox</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Allow pro&amp;grams in desktop window</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Check this option if you want to run X11 programs that draw into the desktop such as xsnow, xpenguin or xmountain. If you have problems with applications like netscape that check the root window for running instances, disable this option.</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
<widget class="TQCheckBox">
<property name="name">
- <cstring>vrootBox</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
+ <cstring>toolTipBox</cstring>
</property>
<property name="text">
- <string>Allow pro&amp;grams in desktop window</string>
+ <string>Show &amp;tooltips</string>
</property>
- <property name="whatsThis" stdset="0">
- <string>Check this option if you want to run X11 programs that draw into the desktop such as xsnow, xpenguin or xmountain. If you have problems with applications like netscape that check the root window for running instances, disable this option.</string>
+ </widget>
+ <widget class="KSeparator">
+ <property name="name">
+ <cstring>iconOptsSeparator</cstring>
</property>
</widget>
- </hbox>
- </widget>
- <widget class="TQCheckBox" row="2" column="0">
- <property name="name">
- <cstring>toolTipBox</cstring>
- </property>
- <property name="text">
- <string>Show &amp;tooltips</string>
- </property>
+ <widget class="TQLayoutWidget">
+ <property name="name">
+ <cstring>iconOptsOuterLayout</cstring>
+ </property>
+ <hbox>
+ <widget class="TQLayoutWidget">
+ <property name="name">
+ <cstring>iconOptsVLayout</cstring>
+ </property>
+ <vbox>
+ <widget class="TQCheckBox">
+ <property name="name">
+ <cstring>lockInPlaceBox</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Lock in Place</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Check this option if you want to prevent your icons from being dragged around.</string>
+ </property>
+ </widget>
+ <widget class="TQCheckBox">
+ <property name="name">
+ <cstring>autoLineupIconsBox</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Align to grid</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Check this option if you want to see your icons automatically aligned to the grid when you move them.</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="TQLayoutWidget">
+ <property name="name">
+ <cstring>spacingVLayout</cstring>
+ </property>
+ <vbox>
+ <widget class="TQLayoutWidget">
+ <property name="name">
+ <cstring>spacingValueLayout</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>spacingLayout</cstring>
+ </property>
+ <widget class="TQLabel">
+ <property name="name">
+ <cstring>spacingLabel</cstring>
+ </property>
+ <property name="text">
+ <string>Icon Spacing:</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Changing this value controls how close or far to each other the icons are placed on the desktop. This option has effect only if the "Align to Grid" option is enabled.</string>
+ </property>
+ </widget>
+ <widget class="TQSpinBox">
+ <property name="name">
+ <cstring>spacingValue</cstring>
+ </property>
+ <property name="specialValueText">
+ <string>Default</string>
+ </property>
+ <property name="suffix">
+ <string> px</string>
+ </property>
+ <property name="minValue">
+ <number>5</number>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Changing this value controls how close or far to each other the icons are placed on the desktop. This option has effect only if the "Align to Grid" option is enabled.</string>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer3</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
+ </widget>
+ <widget class="TQCheckBox">
+ <property name="name">
+ <cstring>spacingCtrlScroll</cstring>
+ </property>
+ <property name="text">
+ <string>Ctrl+Mouse Scroll changes spacing</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Check this if you want to change desktop icon spacing by pressing Ctrl and scrolling on the desktop background.</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
+ </widget>
+ </vbox>
</widget>
- <widget class="TQButtonGroup" row="3" column="0">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>desktopMenuGroup</cstring>
</property>
@@ -151,7 +315,7 @@
</widget>
</vbox>
</widget>
- <widget class="TQGroupBox" row="4" column="0">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>groupBox3</cstring>
</property>
@@ -260,7 +424,7 @@
</widget>
<spacer row="0" column="3" rowspan="3" colspan="1">
<property name="name">
- <cstring>spacer5</cstring>
+ <cstring>spacer4</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
@@ -277,9 +441,9 @@
</spacer>
</grid>
</widget>
- <spacer row="5" column="0">
+ <spacer>
<property name="name">
- <cstring>spacer8</cstring>
+ <cstring>spacer5</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
@@ -294,7 +458,7 @@
</size>
</property>
</spacer>
- </grid>
+ </vbox>
</widget>
<widget class="TQWidget">
<property name="name">
@@ -307,17 +471,6 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="TQCheckBox" row="0" column="0">
- <property name="name">
- <cstring>autoLineupIconsBox</cstring>
- </property>
- <property name="text">
- <string>Automatically &amp;line up icons</string>
- </property>
- <property name="whatsThis" stdset="0">
- <string>Check this option if you want to see your icons automatically aligned to the grid when you move them.</string>
- </property>
- </widget>
<widget class="TQCheckBox" row="1" column="0">
<property name="name">
<cstring>showHiddenBox</cstring>
@@ -421,5 +574,6 @@
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">tdelistview.h</include>
+ <include location="global" impldecl="in implementation">kseparator.h</include>
</includes>
</UI>
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 17fc2f364..3d149ef39 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -28,6 +28,7 @@
#include <tqcombobox.h>
#include <tqpushbutton.h>
#include <tqbuttongroup.h>
+#include <tqspinbox.h>
#include <tqtabwidget.h>
#include <tqwhatsthis.h>
#include <tdelistview.h>
@@ -52,7 +53,7 @@ DesktopBehaviorModule::DesktopBehaviorModule(TDEConfig *config, TQWidget *parent
TQVBoxLayout* layout = new TQVBoxLayout(this);
m_behavior = new DesktopBehavior(config, this);
layout->addWidget(m_behavior);
- connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed()));
+ connect(m_behavior, TQ_SIGNAL(changed()), this, TQ_SLOT(changed()));
}
void DesktopBehaviorModule::changed()
@@ -126,13 +127,16 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"));
- connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed()));
- connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
- connect(showHiddenBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
- connect(vrootBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
- connect(autoLineupIconsBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
- connect(toolTipBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
- connect(mediaListView, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(mediaListViewChanged(TQListViewItem *)));
+ connect(desktopMenuGroup, TQ_SIGNAL(clicked(int)), this, TQ_SIGNAL(changed()));
+ connect(iconsEnabledBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
+ connect(showHiddenBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
+ connect(vrootBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
+ connect(lockInPlaceBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableGridChanged()));
+ connect(autoLineupIconsBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableGridChanged()));
+ connect(toolTipBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
+ connect(mediaListView, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(mediaListViewChanged(TQListViewItem *)));
+ connect(spacingValue, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(spacingChanged(int)));
+ connect(spacingCtrlScroll, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed()));
strMouseButton1 = i18n("&Left button:");
strButtonTxt1 = i18n( "You can choose what happens when"
@@ -151,9 +155,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
leftLabel->setText( strMouseButton1 );
leftLabel->setBuddy( leftComboBox );
fillMenuCombo( leftComboBox );
- connect(leftEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
- connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
- connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
+ connect(leftEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed()));
+ connect(leftComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()));
+ connect(leftComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged()));
TQString wtstr = strButtonTxt1 +
i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
" <li><em>Window list menu:</em> a menu showing all windows on all"
@@ -173,9 +177,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
middleLabel->setBuddy( middleComboBox );
fillMenuCombo( middleComboBox );
- connect(middleEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
- connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
- connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
+ connect(middleEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed()));
+ connect(middleComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()));
+ connect(middleComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged()));
wtstr = i18n("You can choose what happens when"
" you click the middle button of your pointing device on the desktop:"
" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
@@ -197,9 +201,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
rightLabel->setText( strMouseButton3 );
rightLabel->setBuddy( rightComboBox );
fillMenuCombo( rightComboBox );
- connect(rightEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed()));
- connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()));
- connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged()));
+ connect(rightEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed()));
+ connect(rightComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()));
+ connect(rightComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged()));
wtstr = strButtonTxt3 +
i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>"
" <li><em>Window list menu:</em> a menu showing all windows on all"
@@ -219,8 +223,8 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char
if (m_bHasMedia)
{
- connect(enableMediaBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
- connect(enableMediaFreeSpaceOverlayBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
+ connect(enableMediaBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
+ connect(enableMediaFreeSpaceOverlayBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged()));
}
else
{
@@ -236,6 +240,11 @@ void DesktopBehavior::mediaListViewChanged(TQListViewItem * item)
emit changed();
}
+void DesktopBehavior::spacingChanged(int value)
+{
+ emit changed();
+}
+
void DesktopBehavior::setMediaListViewEnabled(bool enabled)
{
for (DesktopBehaviorMediaItem *it=static_cast<DesktopBehaviorMediaItem *>(mediaListView->firstChild());
@@ -307,6 +316,9 @@ void DesktopBehavior::load( bool useDefaults )
g_pConfig->setGroup( "Desktop Icons" );
bool bShowHidden = g_pConfig->readBoolEntry("ShowHidden", DEFAULT_SHOW_HIDDEN_ROOT_ICONS);
showHiddenBox->setChecked(bShowHidden);
+ spacingValue->setValue( g_pConfig->readNumEntry("IconSpacing", 5) );
+ spacingCtrlScroll->setChecked( g_pConfig->readBoolEntry("SpacingCtrlScroll", false) );
+ lockInPlaceBox->setChecked( g_pConfig->readBoolEntry( "LockIcons", false ) );
//bool bVertAlign = g_pConfig->readBoolEntry("VertAlign", DEFAULT_VERT_ALIGN);
TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
previewListView->clear();
@@ -333,6 +345,8 @@ void DesktopBehavior::load( bool useDefaults )
iconsEnabledBox->setChecked( g_pConfig->readBoolEntry( "Enabled", true ) );
autoLineupIconsBox->setChecked( g_pConfig->readBoolEntry( "AutoLineUpIcons", false ) );
+ toggleSpacingOpts();
+
//
g_pConfig->setGroup( "Mouse Buttons" );
TQString s;
@@ -365,6 +379,9 @@ void DesktopBehavior::save()
{
g_pConfig->setGroup( "Desktop Icons" );
g_pConfig->writeEntry("ShowHidden", showHiddenBox->isChecked());
+ g_pConfig->writeEntry("IconSpacing", spacingValue->value());
+ g_pConfig->writeEntry("SpacingCtrlScroll", spacingCtrlScroll->isChecked());
+ g_pConfig->writeEntry("LockIcons", lockInPlaceBox->isChecked());
TQStringList previews;
for ( DesktopBehaviorPreviewItem *item = static_cast<DesktopBehaviorPreviewItem *>( previewListView->firstChild() );
item;
@@ -395,6 +412,8 @@ void DesktopBehavior::save()
g_pConfig->writeEntry( "Enabled", iconsEnabledBox->isChecked() );
g_pConfig->writeEntry( "AutoLineUpIcons", autoLineupIconsBox->isChecked() );
+ toggleSpacingOpts();
+
saveMediaListView();
g_pConfig->sync();
@@ -421,6 +440,9 @@ void DesktopBehavior::enableChanged()
bool enabled = iconsEnabledBox->isChecked();
behaviorTab->setTabEnabled(behaviorTab->page(1), enabled);
vrootBox->setEnabled(enabled);
+ lockInPlaceBox->setEnabled(enabled);
+ autoLineupIconsBox->setEnabled(enabled);
+ enableGridChanged();
if (m_bHasMedia)
{
@@ -433,6 +455,24 @@ void DesktopBehavior::enableChanged()
changed();
}
+void DesktopBehavior::toggleSpacingOpts()
+{
+ bool enabled = (
+ autoLineupIconsBox->isEnabled() && // Desktop grid available
+ autoLineupIconsBox->isChecked() && // Desktop grid enabled
+ !lockInPlaceBox->isChecked() // Lock in Place is off
+ );
+
+ spacingCtrlScroll->setEnabled(enabled);
+ spacingValue->setEnabled(enabled);
+}
+
+void DesktopBehavior::enableGridChanged()
+{
+ toggleSpacingOpts();
+ changed();
+}
+
void DesktopBehavior::comboBoxChanged()
{
int i;
diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h
index bc5965750..bc8aad2d2 100644
--- a/kcontrol/konq/desktopbehavior_impl.h
+++ b/kcontrol/konq/desktopbehavior_impl.h
@@ -28,7 +28,7 @@
class DesktopBehavior : public DesktopBehaviorBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
DesktopBehavior(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L );
virtual void load();
@@ -44,10 +44,12 @@ signals:
void changed();
private slots:
- void enableChanged();
+ void enableChanged();
+ void enableGridChanged();
void comboBoxChanged();
void editButtonPressed();
void mediaListViewChanged(TQListViewItem * item);
+ void spacingChanged(int value);
private:
TDEConfig *g_pConfig;
@@ -56,6 +58,8 @@ private:
void saveMediaListView();
void setMediaListViewEnabled(bool enabled);
+ void toggleSpacingOpts();
+
// Combo for the menus
void fillMenuCombo( TQComboBox * combo );
@@ -65,7 +69,7 @@ private:
class DesktopBehaviorModule : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
DesktopBehaviorModule(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L );
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index a12b02069..e8a99297d 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -66,22 +66,22 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
TQWhatsThis::add( m_pStandard, wtstr );
row++;
- connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ),
- TQT_SLOT( slotStandardFont(const TQString&) ) );
- connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ),
- TQT_SLOT(changed() ) );
- connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ),
- TQT_SLOT( slotStandardFont(const TQString&) ) );
- connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ),
- TQT_SLOT(changed() ) );
+ connect( m_pStandard, TQ_SIGNAL( activated(const TQString&) ),
+ TQ_SLOT( slotStandardFont(const TQString&) ) );
+ connect( m_pStandard, TQ_SIGNAL( activated(const TQString&) ),
+ TQ_SLOT(changed() ) );
+ connect( m_pStandard, TQ_SIGNAL( textChanged(const TQString&) ),
+ TQ_SLOT( slotStandardFont(const TQString&) ) );
+ connect( m_pStandard, TQ_SIGNAL( textChanged(const TQString&) ),
+ TQ_SLOT(changed() ) );
m_pSize = new TQSpinBox( 4,18,1,this );
label = new TQLabel( m_pSize, i18n("Font si&ze:"), this );
lay->addWidget(label,row,0);
lay->addMultiCellWidget(m_pSize,row,row,1,1);
- connect( m_pSize, TQT_SIGNAL( valueChanged(int) ),
- this, TQT_SLOT( slotFontSize(int) ) );
+ connect( m_pSize, TQ_SIGNAL( valueChanged(int) ),
+ this, TQ_SLOT( slotFontSize(int) ) );
row+=2;
wtstr = i18n("This is the font size used to display text in Konqueror windows.");
@@ -94,14 +94,14 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
m_pNormalText = new KColorButton( normalTextColor, this );
label = new TQLabel( m_pNormalText, i18n("Normal te&xt color:"), this );
lay->addWidget(label,row,0);
- lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign);
+ lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(TQt::AlignmentFlags)hAlign);
wtstr = i18n("This is the color used to display text in Konqueror windows.");
TQWhatsThis::add( label, wtstr );
TQWhatsThis::add( m_pNormalText, wtstr );
- connect( m_pNormalText, TQT_SIGNAL( changed( const TQColor & ) ),
- TQT_SLOT( slotNormalTextColorChanged( const TQColor & ) ) );
+ connect( m_pNormalText, TQ_SIGNAL( changed( const TQColor & ) ),
+ TQ_SLOT( slotNormalTextColorChanged( const TQColor & ) ) );
/*
row++;
@@ -115,8 +115,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
TQWhatsThis::add( label, wtstr );
TQWhatsThis::add( m_pHighlightedText, wtstr );
- connect( m_pHighlightedText, TQT_SIGNAL( changed( const TQColor & ) ),
- TQT_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) );
+ connect( m_pHighlightedText, TQ_SIGNAL( changed( const TQColor & ) ),
+ TQ_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) );
*/
row++;
@@ -125,18 +125,18 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
{
m_cbTextBackground = new TQCheckBox( i18n("&Text background color:"), this );
lay->addWidget(m_cbTextBackground,row,0);
- connect( m_cbTextBackground, TQT_SIGNAL( clicked() ),
- TQT_SLOT( slotTextBackgroundClicked() ) );
+ connect( m_cbTextBackground, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( slotTextBackgroundClicked() ) );
m_pTextBackground = new KColorButton( textBackgroundColor, this );
- lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign);
+ lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQt::AlignmentFlags)hAlign);
wtstr = i18n("This is the color used behind the text for the icons on the desktop.");
TQWhatsThis::add( label, wtstr );
TQWhatsThis::add( m_pTextBackground, wtstr );
- connect( m_pTextBackground, TQT_SIGNAL( changed( const TQColor & ) ),
- TQT_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) );
+ connect( m_pTextBackground, TQ_SIGNAL( changed( const TQColor & ) ),
+ TQ_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) );
row++;
}
@@ -146,10 +146,10 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
TQLabel* label = new TQLabel( m_pNbLines, i18n("H&eight for icon text:"), this );
lay->addWidget( label, row, 0 );
lay->addWidget( m_pNbLines, row, 1 );
- connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ),
- this, TQT_SLOT( changed() ) );
- connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ),
- TQT_SLOT( slotPNbLinesChanged(int)) );
+ connect( m_pNbLines, TQ_SIGNAL( valueChanged(int) ),
+ this, TQ_SLOT( changed() ) );
+ connect( m_pNbLines, TQ_SIGNAL( valueChanged(int) ),
+ TQ_SLOT( slotPNbLinesChanged(int)) );
TQString thwt = i18n("This is the maximum number of lines that can be"
" used to draw icon text. Long file names are"
@@ -165,10 +165,10 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
label = new TQLabel( m_pNbWidth, i18n("&Width for icon text:"), this );
lay->addWidget( label, row, 0 );
lay->addWidget( m_pNbWidth, row, 1 );
- connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ),
- this, TQT_SLOT( changed() ) );
- connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ),
- TQT_SLOT( slotPNbWidthChanged(int)) );
+ connect( m_pNbWidth, TQ_SIGNAL( valueChanged(int) ),
+ this, TQ_SLOT( changed() ) );
+ connect( m_pNbWidth, TQ_SIGNAL( valueChanged(int) ),
+ TQ_SLOT( slotPNbWidthChanged(int)) );
thwt = i18n( "This is the maximum width for the icon text when konqueror "
"is used in multi column view mode." );
@@ -179,8 +179,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
}
cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this);
- lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign);
- connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign);
+ connect(cbUnderline, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames"
" being underlined, so that they look like links on a web page. Note:"
@@ -192,8 +192,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
row++;
m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this);
- lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign );
- connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) );
+ lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign );
+ connect( m_pSizeInBytes, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()) );
TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes"
" being displayed in bytes. Otherwise file sizes are"
@@ -263,7 +263,7 @@ void KonqFontOptions::load( bool useDefaults )
m_pTextBackground->setColor( textBackgroundColor );
// Don't keep an invalid color around, otherwise checking the checkbox still gives invalid.
if ( !textBackgroundColor.isValid() )
- textBackgroundColor = Qt::black;
+ textBackgroundColor = TQt::black;
}
else
{
diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h
index 69ffa4af5..10e6837bd 100644
--- a/kcontrol/konq/fontopts.h
+++ b/kcontrol/konq/fontopts.h
@@ -51,7 +51,7 @@ class TDEFontCombo;
class KonqFontOptions : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KonqFontOptions(TDEConfig *config, TQString group, bool desktop, TQWidget *parent=0, const char *name=0);
TQString quickHelp() const;
diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp
index 5ca7cb4ad..c4e3ea506 100644
--- a/kcontrol/konq/main.cpp
+++ b/kcontrol/konq/main.cpp
@@ -48,48 +48,48 @@ static TQCString configname()
extern "C"
{
- KDE_EXPORT TDECModule *create_browser(TQWidget *parent, const char *name)
+ TDE_EXPORT TDECModule *create_browser(TQWidget *parent, const char *name)
{
TDEConfig *config = new TDEConfig("konquerorrc", false, true);
return new KBrowserOptions(config, "FMSettings", parent, name);
}
- KDE_EXPORT TDECModule *create_behavior(TQWidget *parent, const char *name)
+ TDE_EXPORT TDECModule *create_behavior(TQWidget *parent, const char *name)
{
TDEConfig *config = new TDEConfig("konquerorrc", false, true);
return new KBehaviourOptions(config, "FMSettings", parent, name);
}
- KDE_EXPORT TDECModule *create_appearance(TQWidget *parent, const char *name)
+ TDE_EXPORT TDECModule *create_appearance(TQWidget *parent, const char *name)
{
TDEConfig *config = new TDEConfig("konquerorrc", false, true);
return new KonqFontOptions(config, "FMSettings", false, parent, name);
}
- KDE_EXPORT TDECModule *create_previews(TQWidget *parent, const char *name)
+ TDE_EXPORT TDECModule *create_previews(TQWidget *parent, const char *name)
{
return new KPreviewOptions(parent, name);
}
- KDE_EXPORT TDECModule *create_dbehavior(TQWidget *parent, const char* /*name*/)
+ TDE_EXPORT TDECModule *create_dbehavior(TQWidget *parent, const char* /*name*/)
{
TDEConfig *config = new TDEConfig(configname(), false, false);
return new DesktopBehaviorModule(config, parent);
}
- KDE_EXPORT TDECModule *create_dappearance(TQWidget *parent, const char* /*name*/)
+ TDE_EXPORT TDECModule *create_dappearance(TQWidget *parent, const char* /*name*/)
{
TDEConfig *config = new TDEConfig(configname(), false, false);
return new KonqFontOptions(config, "FMSettings", true, parent);
}
- KDE_EXPORT TDECModule *create_dpath(TQWidget *parent, const char* /*name*/)
+ TDE_EXPORT TDECModule *create_dpath(TQWidget *parent, const char* /*name*/)
{
//TDEConfig *config = new TDEConfig(configname(), false, false);
return new DesktopPathConfig(parent);
}
- KDE_EXPORT TDECModule *create_ddesktop(TQWidget *parent, const char* /*name*/)
+ TDE_EXPORT TDECModule *create_ddesktop(TQWidget *parent, const char* /*name*/)
{
return new KDesktopConfig(parent, "VirtualDesktops");
}
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 3b2349fc7..309651dbb 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -130,14 +130,14 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
m_maxSize->setRange( 0.2, 100, 0.2, true );
label->setBuddy( m_maxSize );
lay->addWidget( m_maxSize );
- connect( m_maxSize, TQT_SIGNAL( valueChanged(double) ), TQT_SLOT( changed() ) );
+ connect( m_maxSize, TQ_SIGNAL( valueChanged(double) ), TQ_SLOT( changed() ) );
m_boostSize = new TQCheckBox(i18n("&Increase size of previews relative to icons"), this);
- connect( m_boostSize, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) );
+ connect( m_boostSize, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( changed() ) );
lay->addWidget(m_boostSize);
m_useFileThumbnails = new TQCheckBox(i18n("&Use thumbnails embedded in files"), this);
- connect( m_useFileThumbnails, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) );
+ connect( m_useFileThumbnails, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( changed() ) );
lay->addWidget(m_useFileThumbnails);
diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h
index d76b28560..4b9da1270 100644
--- a/kcontrol/konq/previews.h
+++ b/kcontrol/konq/previews.h
@@ -42,7 +42,7 @@ class KDoubleNumInput;
class KPreviewOptions : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KPreviewOptions( TQWidget *parent = 0L, const char *name = 0L );
virtual void load();
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index 5da14f2f5..be73dcb7a 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -78,7 +78,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
urDesktop->setMode( KFile::Directory );
tmpLabel->setBuddy( urDesktop );
lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL);
- connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(urDesktop, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
TQString wtstr = i18n("This folder contains all the files"
" which you see on your desktop. You can change the location of this"
" folder if you want to, and the contents will move automatically"
@@ -93,7 +93,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
urAutostart->setMode( KFile::Directory );
tmpLabel->setBuddy( urAutostart );
lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL);
- connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(urAutostart, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
wtstr = i18n("This folder contains applications or"
" links to applications (shortcuts) that you want to have started"
" automatically whenever TDE starts. You can change the location of this"
@@ -109,7 +109,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
urDocument->setMode( KFile::Directory );
tmpLabel->setBuddy( urDocument );
lay->addMultiCellWidget(urDocument, row, row, 1, RO_LASTCOL);
- connect(urDocument, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(urDocument, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
wtstr = i18n("This folder will be used by default to load or save documents from or to.");
TQWhatsThis::add( tmpLabel, wtstr );
TQWhatsThis::add( urDocument, wtstr );
@@ -121,7 +121,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
urDownload->setMode( KFile::Directory );
tmpLabel->setBuddy( urDownload );
lay->addMultiCellWidget(urDownload, row, row, 1, RO_LASTCOL);
- connect(urDownload, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(urDownload, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
wtstr = i18n("This folder will be used by default to load or save downloads from or to.");
TQWhatsThis::add( tmpLabel, wtstr );
TQWhatsThis::add( urDownload, wtstr );
@@ -133,7 +133,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
urMusic->setMode( KFile::Directory );
tmpLabel->setBuddy( urMusic );
lay->addMultiCellWidget(urMusic, row, row, 1, RO_LASTCOL);
- connect(urMusic, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(urMusic, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
wtstr = i18n("This folder will be used by default to load or save music from or to.");
TQWhatsThis::add( tmpLabel, wtstr );
TQWhatsThis::add( urMusic, wtstr );
@@ -145,7 +145,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
urPictures->setMode( KFile::Directory );
tmpLabel->setBuddy( urPictures );
lay->addMultiCellWidget(urPictures, row, row, 1, RO_LASTCOL);
- connect(urPictures, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(urPictures, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
wtstr = i18n("This folder will be used by default to load or save pictures from or to.");
TQWhatsThis::add( tmpLabel, wtstr );
TQWhatsThis::add( urPictures, wtstr );
@@ -157,7 +157,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
urPublicShare->setMode( KFile::Directory );
tmpLabel->setBuddy( urPublicShare );
lay->addMultiCellWidget(urPublicShare, row, row, 1, RO_LASTCOL);
- connect(urPublicShare, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(urPublicShare, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
wtstr = i18n("This folder will be used by default to load or save public shared files from or to.");
TQWhatsThis::add( tmpLabel, wtstr );
TQWhatsThis::add( urPublicShare, wtstr );
@@ -169,7 +169,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
urTemplates->setMode( KFile::Directory );
tmpLabel->setBuddy( urTemplates );
lay->addMultiCellWidget(urTemplates, row, row, 1, RO_LASTCOL);
- connect(urTemplates, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(urTemplates, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
wtstr = i18n("This folder will be used by default to load or save templates from or to.");
TQWhatsThis::add( tmpLabel, wtstr );
TQWhatsThis::add( urTemplates, wtstr );
@@ -181,7 +181,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
urVideos->setMode( KFile::Directory );
tmpLabel->setBuddy( urVideos );
lay->addMultiCellWidget(urVideos, row, row, 1, RO_LASTCOL);
- connect(urVideos, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(urVideos, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
wtstr = i18n("This folder will be used by default to load or save videos from or to.");
TQWhatsThis::add( tmpLabel, wtstr );
TQWhatsThis::add( urVideos, wtstr );
@@ -190,7 +190,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
Q_ASSERT( row == RO_LASTROW-1 ); // if it fails here, check the row++ and RO_LASTROW above
loadTmr = new TQTimer(this);
- connect(loadTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(loadTimerDone()));
+ connect(loadTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(loadTimerDone()));
load();
}
@@ -543,8 +543,8 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
m_copyToDest = dest;
m_copyFromSrc = src;
TDEIO::ListJob* job = TDEIO::listDir( src );
- connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
- this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) );
+ connect( job, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
+ this, TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) );
tqApp->enter_loop();
if (m_ok)
@@ -555,7 +555,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
else
{
TDEIO::Job * job = TDEIO::move( src, dest );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
// wait for job
tqApp->enter_loop();
}
@@ -583,7 +583,7 @@ void DesktopPathConfig::slotEntries( TDEIO::Job * job, const TDEIO::UDSEntryList
}
TDEIO::Job * moveJob = TDEIO::move( file.url(), m_copyToDest );
- connect( moveJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( moveJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
tqApp->enter_loop();
}
tqApp->exit_loop();
diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h
index 1f38faabd..c6645bdb8 100644
--- a/kcontrol/konq/rootopts.h
+++ b/kcontrol/konq/rootopts.h
@@ -35,7 +35,7 @@ namespace TDEIO { class Job; }
class DesktopPathConfig : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
DesktopPathConfig(TQWidget *parent = 0L, const char *name = 0L );
virtual void load();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 21:14:28 +0000