diff options
Diffstat (limited to 'kcontrol/kicker')
31 files changed, 588 insertions, 323 deletions
diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp index f2ba15680..e9ed08b0a 100644 --- a/kcontrol/kicker/advancedDialog.cpp +++ b/kcontrol/kicker/advancedDialog.cpp @@ -40,10 +40,10 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name) name, false, false) { - connect(this, TQT_SIGNAL(applyClicked()), - this, TQT_SLOT(save())); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(save())); + connect(this, TQ_SIGNAL(applyClicked()), + this, TQ_SLOT(save())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(save())); TQFrame* page = plainPage(); TQVBoxLayout* layout = new TQVBoxLayout(page); @@ -53,22 +53,22 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name) setMinimumSize( sizeHint() ); - connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->hideButtonSize, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->tintColorB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->tintSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->menubarPanelTransparent, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->menubarPanelBlurred, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->kickerResizeHandle, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->kickerDeepButtons, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); + connect(m_advancedWidget->handles, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->hideButtonSize, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->tintColorB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->tintSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->blurSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->menubarPanelTransparent, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->kickerResizeHandle, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->kickerDeepButtons, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changed())); load(); } @@ -97,10 +97,21 @@ void advancedDialog::load() int tintValue = c.readNumEntry( "TintValue", 33 ); m_advancedWidget->tintSlider->setValue( tintValue ); + // Compatibility with deprecated MenubarPanelBlurred option + int blurValue = 0; + if (c.hasKey("MenubarPanelBlurred")) + { + if (c.readNumEntry("MenubarPanelBlurred", false)) + { + blurValue = 4; + } + c.deleteEntry("MenubarPanelBlurred"); + } + blurValue = c.readNumEntry("BlurValue", blurValue); + m_advancedWidget->blurSlider->setValue(blurValue); + bool transparentMenubarPanel = c.readBoolEntry("MenubarPanelTransparent", false); m_advancedWidget->menubarPanelTransparent->setChecked( transparentMenubarPanel ); - bool blurredMenubarPanel = c.readBoolEntry("MenubarPanelBlurred", false); - m_advancedWidget->menubarPanelBlurred->setChecked( blurredMenubarPanel ); bool useKickerResizeHandle = c.readBoolEntry("UseResizeHandle", false); m_advancedWidget->kickerResizeHandle->setChecked( useKickerResizeHandle ); @@ -125,10 +136,10 @@ void advancedDialog::save() m_advancedWidget->tintColorB->color()); c.writeEntry("TintValue", m_advancedWidget->tintSlider->value()); + c.writeEntry("BlurValue", + m_advancedWidget->blurSlider->value()); c.writeEntry("MenubarPanelTransparent", m_advancedWidget->menubarPanelTransparent->isChecked()); - c.writeEntry("MenubarPanelBlurred", - m_advancedWidget->menubarPanelBlurred->isChecked()); c.writeEntry("UseResizeHandle", m_advancedWidget->kickerResizeHandle->isChecked()); c.writeEntry("ShowDeepButtons", @@ -161,10 +172,10 @@ void advancedDialog::save() m_advancedWidget->tintColorB->color()); extConfig.writeEntry("TintValue", m_advancedWidget->tintSlider->value()); + extConfig.writeEntry("BlurValue", + m_advancedWidget->blurSlider->value()); extConfig.writeEntry("MenubarPanelTransparent", m_advancedWidget->menubarPanelTransparent->isChecked()); - extConfig.writeEntry("MenubarPanelBlurred", - m_advancedWidget->menubarPanelBlurred->isChecked()); extConfig.writeEntry("UseResizeHandle", m_advancedWidget->kickerResizeHandle->isChecked()); extConfig.writeEntry("ShowDeepButtons", @@ -172,7 +183,7 @@ void advancedDialog::save() extConfig.sync(); } - + c.sync(); KickerConfig::the()->notifyKicker(); diff --git a/kcontrol/kicker/advancedDialog.h b/kcontrol/kicker/advancedDialog.h index 12a2ef4bd..a0ffdff6d 100644 --- a/kcontrol/kicker/advancedDialog.h +++ b/kcontrol/kicker/advancedDialog.h @@ -26,7 +26,7 @@ class advancedKickerOptions; class advancedDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: advancedDialog(TQWidget* parent, const char* name); diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui index b1e0aaf37..0e65401db 100644 --- a/kcontrol/kicker/advancedOptions.ui +++ b/kcontrol/kicker/advancedOptions.ui @@ -8,21 +8,30 @@ <rect> <x>0</x> <y>0</y> - <width>324</width> - <height>235</height> + <width>425</width> + <height>360</height> </rect> </property> + <property name="caption"> + <string>advancedKickerOptions</string> + </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> <property name="margin"> - <number>0</number> + <number>5</number> </property> <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> + <property name="frameShape"> + <enum>StyledPanel</enum> + </property> + <property name="margin"> + <number>2</number> + </property> <property name="title"> <string>Panel Dimensions</string> </property> @@ -84,6 +93,12 @@ <property name="name"> <cstring>handles</cstring> </property> + <property name="frameShape"> + <enum>StyledPanel</enum> + </property> + <property name="margin"> + <number>2</number> + </property> <property name="title"> <string>Applet Handles</string> </property> @@ -158,6 +173,20 @@ <property name="name"> <cstring>groupBox2</cstring> </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>4</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>StyledPanel</enum> + </property> + <property name="margin"> + <number>2</number> + </property> <property name="title"> <string>Transparency</string> </property> @@ -165,77 +194,179 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KColorButton" row="0" column="1"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> - <cstring>tintColorB</cstring> + <cstring>textLabel1_2</cstring> </property> <property name="sizePolicy"> <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> + <hsizetype>4</hsizetype> + <vsizetype>5</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="text"> - <string></string> + <string>Ti&nt amount:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>tintSlider</cstring> </property> <property name="whatsThis" stdset="0"> - <string>Click on this button to set the color to use when tinting transparent panels.</string> + <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> + </property> + </widget> + <widget class="TQLabel" row="4" column="3"> + <property name="name"> + <cstring>textLabel2</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>4</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Max</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + <property name="whatsThis" stdset="0"> + <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> + </property> + </widget> + <widget class="TQLabel" row="6" column="3"> + <property name="name"> + <cstring>textLabel2_2</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>4</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Max blur</string> + </property> + <property name="alignment"> + <set>AlignVCenter|AlignRight</set> + </property> + <property name="whatsThis" stdset="0"> + <string>Use this slider to set how much transparent panels should be blurred.</string> </property> </widget> - <spacer row="2" column="0"> + <spacer row="7" column="2"> <property name="name"> - <cstring>spacer2</cstring> + <cstring>spacer2_2_2</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> <property name="sizeType"> - <enum>Expanding</enum> + <enum>Maximum</enum> </property> <property name="sizeHint"> <size> <width>20</width> - <height>21</height> + <height>16</height> </size> </property> </spacer> - <widget class="TQLabel" row="2" column="1"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> - <cstring>textLabel3</cstring> + <cstring>textLabel1_2_2</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>4</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> <property name="text"> - <string>Min</string> + <string>&Blur amount:</string> </property> - <property name="alignment"> - <set>AlignVCenter|AlignLeft</set> + <property name="buddy" stdset="0"> + <cstring>blurSlider</cstring> </property> <property name="whatsThis" stdset="0"> - <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> + <string>Use this slider to set how much transparent panels should be blurred.</string> </property> </widget> - <spacer row="0" column="2"> + <widget class="TQLabel" row="0" column="0"> + <property name="name"> + <cstring>textLabel1</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>4</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Tint c&olor:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>tintColorB</cstring> + </property> + <property name="whatsThis" stdset="0"> + <string>Click on this button to set the color to use when tinting transparent panels.</string> + </property> + </widget> + <spacer row="6" column="0"> <property name="name"> - <cstring>spacer3</cstring> + <cstring>spacer2_2</cstring> </property> <property name="orientation"> - <enum>Horizontal</enum> + <enum>Vertical</enum> </property> <property name="sizeType"> - <enum>Expanding</enum> + <enum>Maximum</enum> </property> <property name="sizeHint"> <size> - <width>81</width> + <width>20</width> + <height>16</height> + </size> + </property> + </spacer> + <spacer row="4" column="0"> + <property name="name"> + <cstring>spacer2_2_2_2</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>MinimumExpanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="TQSlider" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQSlider" row="2" column="1" rowspan="2" colspan="3"> <property name="name"> <cstring>tintSlider</cstring> </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="orientation"> <enum>Horizontal</enum> </property> @@ -243,49 +374,87 @@ <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> </property> </widget> - <widget class="TQLabel" row="2" column="2"> + <widget class="KColorButton" row="0" column="1"> <property name="name"> - <cstring>textLabel2</cstring> + <cstring>tintColorB</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>4</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> <property name="text"> - <string>Max</string> + <string></string> + </property> + <property name="whatsThis" stdset="0"> + <string>Click on this button to set the color to use when tinting transparent panels.</string> + </property> + </widget> + <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="2"> + <property name="name"> + <cstring>textLabel3</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>4</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Min</string> </property> <property name="alignment"> - <set>AlignVCenter|AlignRight</set> + <set>AlignVCenter|AlignLeft</set> </property> <property name="whatsThis" stdset="0"> <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> </property> </widget> - <widget class="TQLabel" row="1" column="0"> + <widget class="TQSlider" row="5" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>textLabel1_2</cstring> + <cstring>blurSlider</cstring> </property> - <property name="text"> - <string>Ti&nt amount:</string> + <property name="minValue"> + <number>0</number> </property> - <property name="buddy" stdset="0"> - <cstring>tintSlider</cstring> + <property name="maxValue"> + <number>10</number> + </property> + <property name="orientation"> + <enum>Horizontal</enum> </property> <property name="whatsThis" stdset="0"> - <string>Use this slider to set how much transparent panels should be tinted using the tint color.</string> + <string>Use this slider to set how much transparent panels should be blurred.</string> </property> </widget> - <widget class="TQLabel" row="0" column="0"> + <widget class="TQLabel" row="6" column="1"> <property name="name"> - <cstring>textLabel1</cstring> + <cstring>textLabel3_2</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>4</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> <property name="text"> - <string>Tint c&olor:</string> + <string>No blur</string> </property> - <property name="buddy" stdset="0"> - <cstring>tintColorB</cstring> + <property name="alignment"> + <set>AlignVCenter|AlignLeft</set> </property> <property name="whatsThis" stdset="0"> - <string>Click on this button to set the color to use when tinting transparent panels.</string> + <string>Use this slider to set how much transparent panels should be blurred.</string> </property> </widget> - <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>menubarPanelTransparent</cstring> </property> @@ -296,54 +465,49 @@ <string>Normally if you have the desktop's or current application's menu bar displayed in a panel at the top of the screen (MacOS-style), transparency is disabled for this panel to avoid the desktop background clashing with the menu bar. Set this option to make it transparent anyways.</string> </property> </widget> - <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> + </grid> + </widget> + <widget class="TQGroupBox"> + <property name="name"> + <cstring>groupBox3</cstring> + </property> + <property name="frameShape"> + <enum>StyledPanel</enum> + </property> + <property name="margin"> + <number>2</number> + </property> + <property name="title"> + <string>Texture</string> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> - <cstring>menubarPanelBlurred</cstring> + <cstring>kickerResizeHandle</cstring> </property> <property name="text"> - <string>Blur the background when transparency is enabled</string> + <string>Show resize handle on panels</string> </property> <property name="whatsThis" stdset="0"> - <string>When checked, the displayed semi-transparent background image will be blurred to reduce eyestrain.</string> + <string>Enabling this option will show a resize handle on the resizable end of each panel.</string> + </property> + </widget> + <widget class="TQCheckBox" row="0" column="1"> + <property name="name"> + <cstring>kickerDeepButtons</cstring> + </property> + <property name="text"> + <string>Use deep buttons</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Enabling this option will yield more highly textured panels.</string> </property> </widget> </grid> </widget> - <widget class="TQGroupBox"> - <property name="name"> - <cstring>groupBox3</cstring> - </property> - <property name="title"> - <string>Texture</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQCheckBox" row="0" column="0" rowspan="0" colspan="2"> - <property name="name"> - <cstring>kickerResizeHandle</cstring> - </property> - <property name="text"> - <string>Show resize handle on panels</string> - </property> - <property name="whatsThis" stdset="0"> - <string>Enabling this option will show a resize handle on the resizable end of each panel.</string> - </property> - </widget> - <widget class="TQCheckBox" row="0" column="2" rowspan="0" colspan="2"> - <property name="name"> - <cstring>kickerDeepButtons</cstring> - </property> - <property name="text"> - <string>Use deep buttons</string> - </property> - <property name="whatsThis" stdset="0"> - <string>Enabling this option will yield more highly textured panels.</string> - </property> - </widget> - </grid> - </widget> </vbox> </widget> <tabstops> @@ -358,6 +522,7 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in declaration">knuminput.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/kcontrol/kicker/applettab.ui b/kcontrol/kicker/applettab.ui index bcdfef2f8..05549de36 100644 --- a/kcontrol/kicker/applettab.ui +++ b/kcontrol/kicker/applettab.ui @@ -217,11 +217,9 @@ </vbox> </widget> <includes> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">qwidget.h</include> + <include location="local" impldecl="in implementation">kdialog.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>qwidget.h</includehint> -</includehints> </UI> diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index c2f488550..a03d1d157 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -31,7 +31,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <kdialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelistview.h> #include <kdebug.h> @@ -42,16 +42,16 @@ AppletTab::AppletTab( TQWidget *parent, const char* name ) : AppletTabBase (parent, name) { - connect(level_group, TQT_SIGNAL(clicked(int)), TQT_SLOT(level_changed(int))); + connect(level_group, TQ_SIGNAL(clicked(int)), TQ_SLOT(level_changed(int))); - connect(lb_trusted, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(trusted_selection_changed(TQListViewItem*))); + connect(lb_trusted, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(trusted_selection_changed(TQListViewItem*))); - connect(pb_add, TQT_SIGNAL(clicked()), TQT_SLOT(add_clicked())); - connect(pb_remove, TQT_SIGNAL(clicked()), TQT_SLOT(remove_clicked())); + connect(pb_add, TQ_SIGNAL(clicked()), TQ_SLOT(add_clicked())); + connect(pb_remove, TQ_SIGNAL(clicked()), TQ_SLOT(remove_clicked())); - connect(lb_available, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(available_selection_changed(TQListViewItem*))); + connect(lb_available, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(available_selection_changed(TQListViewItem*))); pb_add->setEnabled(false); pb_remove->setEnabled(false); diff --git a/kcontrol/kicker/applettab_impl.h b/kcontrol/kicker/applettab_impl.h index a92e166d6..14a082c17 100644 --- a/kcontrol/kicker/applettab_impl.h +++ b/kcontrol/kicker/applettab_impl.h @@ -33,7 +33,7 @@ class TQListViewItem; class AppletTab : public AppletTabBase { - Q_OBJECT + TQ_OBJECT public: AppletTab( TQWidget *parent=0, const char* name=0 ); diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp index a773e063d..bd0bd2f11 100644 --- a/kcontrol/kicker/extensionInfo.cpp +++ b/kcontrol/kicker/extensionInfo.cpp @@ -19,7 +19,7 @@ #include <tqapplication.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdelocale.h> #include "extensionInfo.h" @@ -54,7 +54,7 @@ void ExtensionInfo::load() } else { - KDesktopFile df(_desktopFile); + TDEDesktopFile df(_desktopFile); _name = df.readName(); _resizeable = df.readBoolEntry("X-TDE-PanelExt-Resizeable", _resizeable); diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp index 506eebdfb..d94f18bfa 100644 --- a/kcontrol/kicker/hidingconfig.cpp +++ b/kcontrol/kicker/hidingconfig.cpp @@ -41,13 +41,13 @@ HidingConfig::HidingConfig(TQWidget *parent, const char *name) //addConfig(KickerSettings::self(), m_widget); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); - connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), - this, TQT_SLOT(aboutToNotifyKicker())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()), + this, TQ_SLOT(aboutToNotifyKicker())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void HidingConfig::notChanged() @@ -90,7 +90,7 @@ void HidingConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } TQString HidingConfig::handbookSection() const diff --git a/kcontrol/kicker/hidingconfig.h b/kcontrol/kicker/hidingconfig.h index 1a6e22472..427201c62 100644 --- a/kcontrol/kicker/hidingconfig.h +++ b/kcontrol/kicker/hidingconfig.h @@ -24,7 +24,7 @@ class HidingTab; class HidingConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: HidingConfig(TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui index 542d66bd2..b0a9088cb 100644 --- a/kcontrol/kicker/hidingtab.ui +++ b/kcontrol/kicker/hidingtab.ui @@ -762,14 +762,11 @@ <includes> <include location="global" impldecl="in declaration">klineedit.h</include> <include location="global" impldecl="in implementation">knuminput.h</include> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot specifier="pure virtual">switchPanel(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>knuminput.h</includehint> -</includehints> </UI> diff --git a/kcontrol/kicker/hidingtab_impl.cpp b/kcontrol/kicker/hidingtab_impl.cpp index 8c340bd5d..382c1a84e 100644 --- a/kcontrol/kicker/hidingtab_impl.cpp +++ b/kcontrol/kicker/hidingtab_impl.cpp @@ -38,33 +38,33 @@ HidingTab::HidingTab(TQWidget *parent, const char* name) m_panelInfo(0) { // connections - connect(m_manual,TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked())); - connect(m_background, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_background, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked())); - connect(m_xineramaHide, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_hideSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_animateHiding, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_autoHideSwitch, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_backgroundRaise, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_backgroundPos, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_lHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_rHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - - connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()), - TQT_SLOT(infoUpdated())); - connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)), - TQT_SLOT(extensionAdded(ExtensionInfo*))); - connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)), - TQT_SLOT(extensionRemoved(ExtensionInfo*))); + connect(m_manual,TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_automatic, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_automatic, TQ_SIGNAL(toggled(bool)), TQ_SLOT(backgroundModeClicked())); + connect(m_background, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_background, TQ_SIGNAL(toggled(bool)), TQ_SLOT(backgroundModeClicked())); + connect(m_xineramaHide, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_hideSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_delaySpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_animateHiding, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_delaySpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_autoHideSwitch, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_backgroundRaise, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_backgroundPos, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_lHB, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_rHB, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + + connect(KickerConfig::the(), TQ_SIGNAL(extensionInfoChanged()), + TQ_SLOT(infoUpdated())); + connect(KickerConfig::the(), TQ_SIGNAL(extensionAdded(ExtensionInfo*)), + TQ_SLOT(extensionAdded(ExtensionInfo*))); + connect(KickerConfig::the(), TQ_SIGNAL(extensionRemoved(ExtensionInfo*)), + TQ_SLOT(extensionRemoved(ExtensionInfo*))); // position tab tells hiding tab about extension selections and vice versa - connect(KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int)), - TQT_SLOT(switchPanel(int))); - connect(m_panelList, TQT_SIGNAL(activated(int)), - KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int))); + connect(KickerConfig::the(), TQ_SIGNAL(positionPanelChanged(int)), + TQ_SLOT(switchPanel(int))); + connect(m_panelList, TQ_SIGNAL(activated(int)), + KickerConfig::the(), TQ_SIGNAL(hidingPanelChanged(int))); } void HidingTab::load() diff --git a/kcontrol/kicker/hidingtab_impl.h b/kcontrol/kicker/hidingtab_impl.h index 34bc6a372..f5cd67ed1 100644 --- a/kcontrol/kicker/hidingtab_impl.h +++ b/kcontrol/kicker/hidingtab_impl.h @@ -26,7 +26,7 @@ class ExtensionInfo; class HidingTab : public HidingTabBase { - Q_OBJECT + TQ_OBJECT public: HidingTab(TQWidget *parent = 0, const char* name = 0); diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp index d7cbadf28..082753cb9 100644 --- a/kcontrol/kicker/lookandfeelconfig.cpp +++ b/kcontrol/kicker/lookandfeelconfig.cpp @@ -41,13 +41,13 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) addConfig(KickerSettings::self(), m_widget); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); - connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), - this, TQT_SLOT(aboutToNotifyKicker())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()), + this, TQ_SLOT(aboutToNotifyKicker())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void LookAndFeelConfig::notChanged() @@ -90,7 +90,7 @@ void LookAndFeelConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } TQString LookAndFeelConfig::handbookSection() const diff --git a/kcontrol/kicker/lookandfeelconfig.h b/kcontrol/kicker/lookandfeelconfig.h index ff8a55b38..f35a33f45 100644 --- a/kcontrol/kicker/lookandfeelconfig.h +++ b/kcontrol/kicker/lookandfeelconfig.h @@ -24,7 +24,7 @@ class LookAndFeelTab; class LookAndFeelConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: LookAndFeelConfig(TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui index 7938f5f6c..fcc746f57 100644 --- a/kcontrol/kicker/lookandfeeltab.ui +++ b/kcontrol/kicker/lookandfeeltab.ui @@ -617,20 +617,18 @@ This option is only active if 'Enable background image' is selected.</string> <tabstop>advancedOptionsButton</tabstop> </tabstops> <includes> - <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in declaration">kcombobox.h</include> <include location="global" impldecl="in declaration">kurlrequester.h</include> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">launchAdvancedDialog()</slot> <slot access="protected" specifier="pure virtual">browseTheme(const TQString&)</slot> <slot access="protected" specifier="pure virtual">enableTransparency(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp index 674b1cd04..cc8c61515 100644 --- a/kcontrol/kicker/lookandfeeltab_impl.cpp +++ b/kcontrol/kicker/lookandfeeltab_impl.cpp @@ -31,7 +31,7 @@ #include <klineedit.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kickerSettings.h> #include "advancedDialog.h" @@ -48,21 +48,21 @@ LookAndFeelTab::LookAndFeelTab( TQWidget *parent, const char* name ) : LookAndFeelTabBase(parent, name), m_advDialog(0) { - connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); + connect(m_kmenuTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_desktopTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_browserTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_urlTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_windowListTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); - connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SLOT(kmenuTileChanged(int))); - connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SLOT(desktopTileChanged(int))); - connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SLOT(browserTileChanged(int))); - connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SLOT(urlTileChanged(int))); - connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SLOT(wlTileChanged(int))); + connect(m_kmenuTile, TQ_SIGNAL(activated(int)), TQ_SLOT(kmenuTileChanged(int))); + connect(m_desktopTile, TQ_SIGNAL(activated(int)), TQ_SLOT(desktopTileChanged(int))); + connect(m_browserTile, TQ_SIGNAL(activated(int)), TQ_SLOT(browserTileChanged(int))); + connect(m_urlTile, TQ_SIGNAL(activated(int)), TQ_SLOT(urlTileChanged(int))); + connect(m_windowListTile, TQ_SIGNAL(activated(int)), TQ_SLOT(wlTileChanged(int))); - connect(kcfg_ColorizeBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(browseTheme())); + connect(kcfg_ColorizeBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(browseTheme())); - connect(kcfg_BackgroundTheme->lineEdit(), TQT_SIGNAL(lostFocus()), TQT_SLOT(browseTheme())); + connect(kcfg_BackgroundTheme->lineEdit(), TQ_SIGNAL(lostFocus()), TQ_SLOT(browseTheme())); kcfg_BackgroundTheme->setFilter(KImageIO::pattern(KImageIO::Reading)); kcfg_BackgroundTheme->setCaption(i18n("Select Image File")); @@ -92,7 +92,7 @@ void LookAndFeelTab::launchAdvancedDialog() if (!m_advDialog) { m_advDialog = new advancedDialog(this, "advancedDialog"); - connect(m_advDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(finishAdvancedDialog())); + connect(m_advDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(finishAdvancedDialog())); m_advDialog->show(); } m_advDialog->setActiveWindow(); diff --git a/kcontrol/kicker/lookandfeeltab_impl.h b/kcontrol/kicker/lookandfeeltab_impl.h index 704a359db..49c366dfe 100644 --- a/kcontrol/kicker/lookandfeeltab_impl.h +++ b/kcontrol/kicker/lookandfeeltab_impl.h @@ -28,7 +28,7 @@ class advancedDialog; class LookAndFeelTab : public LookAndFeelTabBase { - Q_OBJECT + TQ_OBJECT public: LookAndFeelTab(TQWidget *parent = 0, const char* name = 0); diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp index 5695e3869..a703ea966 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.cpp +++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp @@ -48,7 +48,7 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) layout->addWidget(lookandfeeltab); layout->addStretch(); - connect(lookandfeeltab, TQT_SIGNAL(changed()), TQT_SLOT(configChanged())); + connect(lookandfeeltab, TQ_SIGNAL(changed()), TQ_SLOT(configChanged())); load(); } diff --git a/kcontrol/kicker/lookandfeeltab_kcm.h b/kcontrol/kicker/lookandfeeltab_kcm.h index 32a89b4f8..54df41784 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.h +++ b/kcontrol/kicker/lookandfeeltab_kcm.h @@ -24,7 +24,7 @@ class LookAndFeelTab; class LookAndFeelConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: LookAndFeelConfig(TQWidget *parent = 0L, const char *name = 0L); diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index da73da7c3..ae5260f6e 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -25,7 +25,7 @@ #include <kimageio.h> #include <tdelistview.h> #include <kstaticdeleter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "hidingconfig.h" @@ -63,15 +63,15 @@ KickerConfig::KickerConfig(TQWidget *parent, const char *name) init(); - kapp->dcopClient()->setNotifications(true); + tdeApp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configSwitchToPanel(TQString)", "jumpToPanel(TQString)", false); - kapp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray()); + tdeApp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray()); - connect(this, TQT_SIGNAL(hidingPanelChanged(int)), - this, TQT_SLOT(setCurrentPanelIndex(int))); - connect(this, TQT_SIGNAL(positionPanelChanged(int)), - this, TQT_SLOT(setCurrentPanelIndex(int))); + connect(this, TQ_SIGNAL(hidingPanelChanged(int)), + this, TQ_SLOT(setCurrentPanelIndex(int))); + connect(this, TQ_SIGNAL(positionPanelChanged(int)), + this, TQ_SLOT(setCurrentPanelIndex(int))); } KickerConfig::~KickerConfig() @@ -90,7 +90,7 @@ KickerConfig::~KickerConfig() // this method may get called multiple times during the life of the control panel! void KickerConfig::init() { - disconnect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&))); + disconnect(configFileWatch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(configChanged(const TQString&))); configFileWatch->stopScan(); for (ExtensionInfoList::iterator it = m_extensionInfo.begin(); it != m_extensionInfo.end(); @@ -128,20 +128,20 @@ void KickerConfig::init() setupExtensionInfo(*config, true, true); - connect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&))); + connect(configFileWatch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(configChanged(const TQString&))); configFileWatch->startScan(); } void KickerConfig::restartKicker() { // Tell kicker to restart - if (!kapp->dcopClient()->isAttached()) + if (!tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } TQCString appname; appname = "kicker"; - kapp->dcopClient()->send(appname, appname, "restart", TQString("")); + tdeApp->dcopClient()->send(appname, appname, "restart", TQString("")); } void KickerConfig::notifyKicker() @@ -151,9 +151,9 @@ void KickerConfig::notifyKicker() emit aboutToNotifyKicker(); // Tell kicker about the new config file. - if (!kapp->dcopClient()->isAttached()) + if (!tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } TQByteArray data; @@ -168,7 +168,7 @@ void KickerConfig::notifyKicker() appname.sprintf("kicker-screen-%d", m_screenNumber); } - kapp->dcopClient()->send(appname, appname, "configure()", data); + tdeApp->dcopClient()->send(appname, appname, "configure()", data); } void KickerConfig::setupExtensionInfo(TDEConfig& config, bool checkExists, bool reloadIfExists) @@ -371,7 +371,7 @@ TDEAboutData *KickerConfig::aboutData() extern "C" { - KDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name) { TDECModuleContainer *container = new TDECModuleContainer(parent, "kcmkicker"); container->addModule("kicker_config_arrangement"); @@ -381,26 +381,26 @@ extern "C" return container; } - KDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/) { TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") + "kicker/extensions"); return new PositionConfig(parent, "kcmkicker"); } - KDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/) { TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") + "kicker/extensions"); return new HidingConfig(parent, "kcmkicker"); } - KDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/) { return new MenuConfig(parent, "kcmkicker"); } - KDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/) { KImageIO::registerFormats(); TDEGlobal::dirs()->addResourceType("tiles", TDEStandardDirs::kde_default("data") + diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h index 06bf2ec03..9b832ab38 100644 --- a/kcontrol/kicker/main.h +++ b/kcontrol/kicker/main.h @@ -29,7 +29,7 @@ class KDirWatch; class KickerConfig : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp index 4f8a68605..6773105c6 100644 --- a/kcontrol/kicker/menuconfig.cpp +++ b/kcontrol/kicker/menuconfig.cpp @@ -41,13 +41,13 @@ MenuConfig::MenuConfig(TQWidget *parent, const char *name) addConfig(KickerSettings::self(), m_widget); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); - connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), - this, TQT_SLOT(aboutToNotifyKicker())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()), + this, TQ_SLOT(aboutToNotifyKicker())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void MenuConfig::notChanged() @@ -90,7 +90,7 @@ void MenuConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changedm, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } TQString MenuConfig::handbookSection() const diff --git a/kcontrol/kicker/menuconfig.h b/kcontrol/kicker/menuconfig.h index a5fa29daf..373e1cbf8 100644 --- a/kcontrol/kicker/menuconfig.h +++ b/kcontrol/kicker/menuconfig.h @@ -24,7 +24,7 @@ class MenuTab; class MenuConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: MenuConfig(TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui index fa3868004..17b0d89da 100644 --- a/kcontrol/kicker/menutab.ui +++ b/kcontrol/kicker/menutab.ui @@ -325,7 +325,7 @@ </property> <widget class="TQLabel" row="0" column="0"> <property name="name"> - <cstring>TextLabel1_3_3_2</cstring> + <cstring>TextLabel1_3_3_1</cstring> </property> <property name="sizePolicy"> <sizepolicy> @@ -705,7 +705,40 @@ <string><qt>When this option is selected a text-based search field will appear in the TDE Menu.</qt></string> </property> </widget> - <spacer row="0" column="1" rowspan="3" colspan="1"> + + <widget class="TQLayoutWidget" row="2" column="0"> + <property name="name"> + <cstring>m_searchShortcutLayout</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + + <widget class="TQLabel"> + <property name="name"> + <cstring>searchShortcutLabel</cstring> + </property> + <property name="text"> + <string>Search shortcut:</string> + </property> + <property name="whatsThis" stdset="0"> + <string>From here you can change the keyboard shortcut which triggers the search line in the TDE Menu.</string> + </property> + </widget> + + <widget class="KKeyButton"> + <property name="name"> + <cstring>m_searchShortcut</cstring> + </property> + <property name="whatsThis" stdset="0"> + <string>From here you can change the keyboard shortcut which triggers the search line in the TDE Menu.</string> + </property> + </widget> + </hbox> + </widget> + + <spacer row="0" column="1" rowspan="3" colspan="2"> <property name="name"> <cstring>Spacer8</cstring> </property> @@ -749,7 +782,46 @@ <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">tdefontrequester.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">kkeybutton.h</include> </includes> + <connections> + <connection> + <sender>kcfg_ShowKMenuText</sender> + <signal>toggled(bool)</signal> + <receiver>TextLabel1_3_3_1</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>kcfg_ShowKMenuText</sender> + <signal>toggled(bool)</signal> + <receiver>kcfg_KMenuText</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>kcfg_ShowKMenuText</sender> + <signal>toggled(bool)</signal> + <receiver>TextLabel1_3_3_2</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>kcfg_ShowKMenuText</sender> + <signal>toggled(bool)</signal> + <receiver>kcfg_ButtonFont</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>kcfg_UseSearchBar</sender> + <signal>toggled(bool)</signal> + <receiver>searchShortcutLabel</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>kcfg_UseSearchBar</sender> + <signal>toggled(bool)</signal> + <receiver>m_searchShortcut</receiver> + <slot>setEnabled(bool)</slot> + </connection> + </connections> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index fe20f2302..44643d366 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -29,14 +29,16 @@ #include <dcopref.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kiconloader.h> #include <tdelistview.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <knuminput.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefontrequester.h> +#include <kkeybutton.h> +#include <tdemessagebox.h> #include <kicondialog.h> #include <kiconloader.h> @@ -77,12 +79,12 @@ MenuTab::MenuTab( TQWidget *parent, const char* name ) m_kmenu_button_changed(false) { // connections - connect(m_editKMenuButton, TQT_SIGNAL(clicked()), TQT_SLOT(launchMenuEditor())); - connect(btnCustomKMenuIcon, TQT_SIGNAL(clicked()), TQT_SLOT(launchIconEditor())); - connect(kcfg_KMenuText, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(kmenuChanged())); - connect(kcfg_ShowKMenuText, TQT_SIGNAL(toggled(bool)), TQT_SLOT(kmenuChanged())); - //connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged())); - connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged())); + connect(m_editKMenuButton, TQ_SIGNAL(clicked()), TQ_SLOT(launchMenuEditor())); + connect(btnCustomKMenuIcon, TQ_SIGNAL(clicked()), TQ_SLOT(launchIconEditor())); + connect(kcfg_KMenuText, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(kmenuChanged())); + connect(kcfg_ShowKMenuText, TQ_SIGNAL(toggled(bool)), TQ_SLOT(kmenuChanged())); + //connect(kcfg_ButtonFont, TQ_SIGNAL(fontSelected(const TQFont &)), TQ_SLOT(kmenuChanged())); + connect(maxrecentdocs, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(kmenuChanged())); // FIXME // When top pixmap support is ready for end-user visibility, replace @@ -127,7 +129,7 @@ void MenuTab::load( bool useDefaults ) TQString::null, SmallIcon("bookmark"), c->readBoolEntry("UseBookmarks", false)); - connect(m_bookmarkMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(m_bookmarkMenu, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); // show the quick menus menu? m_quickBrowserMenu = new kSubMenuItem(m_subMenus, @@ -135,7 +137,7 @@ void MenuTab::load( bool useDefaults ) TQString::null, SmallIcon("kdisknav"), c->readBoolEntry("UseBrowser", false)); - connect(m_quickBrowserMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(m_quickBrowserMenu, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); TQStringList ext_default; ext_default << "prefmenu.desktop" << "systemmenu.desktop"; @@ -148,13 +150,13 @@ void MenuTab::load( bool useDefaults ) TQStringList av = d.entryList(); for (TQStringList::ConstIterator it=av.begin(); it!=av.end(); ++it) { - KDesktopFile df(d.absFilePath(*it), true); + TDEDesktopFile df(d.absFilePath(*it), true); menuItem = new kSubMenuItem(m_subMenus, df.readName(), *it, SmallIcon(df.readIcon()), tqFind(ext.begin(), ext.end(), *it) != ext.end()); - connect(menuItem, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(menuItem, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); } } @@ -163,12 +165,17 @@ void MenuTab::load( bool useDefaults ) m_openOnHover->setChecked( c->readBoolEntry("OpenOnHover", true) ); menuStyleChanged(); - connect(m_comboMenuStyle, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_comboMenuStyle, TQT_SIGNAL(activated(int)), TQT_SLOT(menuStyleChanged())); - connect(m_openOnHover, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed())); + connect(m_comboMenuStyle, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_comboMenuStyle, TQ_SIGNAL(activated(int)), TQ_SLOT(menuStyleChanged())); + connect(m_openOnHover, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed())); m_showFrequent->setChecked(true); - + + c->setGroup("KMenu"); + m_searchShortcut->setShortcut(TDEShortcut(c->readEntry("SearchShortcut", "/")), false); + connect(m_searchShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SIGNAL(changed())); + connect(m_searchShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SLOT(setSearchShortcut(const TDEShortcut&))); + if ( useDefaults ) emit changed(); } @@ -288,6 +295,7 @@ void MenuTab::save() // Save KMenu settings c->setGroup("KMenu"); c->writeEntry("CustomIcon", m_kmenu_icon); + c->writeEntry("SearchShortcut", (m_searchShortcut->shortcut()).toString()); c->sync(); // Save recent documents @@ -349,3 +357,22 @@ void MenuTab::kmenuChanged() //m_kmenu_button_changed = true; emit changed(); } + +void MenuTab::setSearchShortcut(const TDEShortcut &cut) +{ + if( cut.contains( KKeySequence(KKey(TQt::Key_Escape)) ) ) + { + int anotherTry = KMessageBox::warningYesNo( + this, + i18n("Cannot set Escape as menu search shortcut.\nWould you like to set another shortcut?"), + i18n("Invalid shortcut") + ); + + if( anotherTry == KMessageBox::Yes ) + m_searchShortcut->captureShortcut(); + + return; + } + + m_searchShortcut->setShortcut(cut, false); +} diff --git a/kcontrol/kicker/menutab_impl.h b/kcontrol/kicker/menutab_impl.h index b143b0072..1344f2950 100644 --- a/kcontrol/kicker/menutab_impl.h +++ b/kcontrol/kicker/menutab_impl.h @@ -21,13 +21,14 @@ #include <tqlistview.h> #include <stdlib.h> +#include <tdeshortcut.h> #include <kpushbutton.h> #include "menutab.h" class kSubMenuItem : public TQObject, public TQCheckListItem { - Q_OBJECT + TQ_OBJECT public: kSubMenuItem(TQListView* parent, @@ -50,7 +51,7 @@ class kSubMenuItem : public TQObject, public TQCheckListItem class MenuTab : public MenuTabBase { - Q_OBJECT + TQ_OBJECT public: MenuTab( TQWidget *parent=0, const char* name=0 ); @@ -68,12 +69,14 @@ public slots: void menuStyleChanged(); void launchIconEditor(); void kmenuChanged(); + void setSearchShortcut(const TDEShortcut &cut); protected: kSubMenuItem *m_bookmarkMenu; kSubMenuItem *m_quickBrowserMenu; TQString m_kmenu_icon; bool m_kmenu_button_changed; + }; #endif diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp index 00b571d13..cd871ae22 100644 --- a/kcontrol/kicker/positionconfig.cpp +++ b/kcontrol/kicker/positionconfig.cpp @@ -41,13 +41,13 @@ PositionConfig::PositionConfig(TQWidget *parent, const char *name) //addConfig(KickerSettings::self(), m_widget); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); - connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), - this, TQT_SLOT(aboutToNotifyKicker())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()), + this, TQ_SLOT(aboutToNotifyKicker())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void PositionConfig::notChanged() @@ -90,7 +90,7 @@ void PositionConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } TQString PositionConfig::handbookSection() const diff --git a/kcontrol/kicker/positionconfig.h b/kcontrol/kicker/positionconfig.h index 93d7cb533..264533e7e 100644 --- a/kcontrol/kicker/positionconfig.h +++ b/kcontrol/kicker/positionconfig.h @@ -24,7 +24,7 @@ class PositionTab; class PositionConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: PositionConfig(TQWidget *parent = 0, const char *name = 0); diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui index ac367a15f..fb3427b03 100644 --- a/kcontrol/kicker/positiontab.ui +++ b/kcontrol/kicker/positiontab.ui @@ -380,7 +380,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <string>Si&ze</string> </property> <property name="whatsThis" stdset="0"> - <string>This sets the size of the panel.</string> + <string>This sets the height of the panel. Tiny is 24 pixels high, Small is 30 pixels, Normal is 46 pixels, Large is 58 pixels.</string> </property> <grid> <property name="name"> @@ -1110,20 +1110,14 @@ how it is positioned on the screen and how much of the screen it should use.</st <includes> <include location="global" impldecl="in declaration">klineedit.h</include> <include location="global" impldecl="in implementation">knuminput.h</include> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">lengthenPanel( int )</slot> <slot access="protected" specifier="pure virtual">movePanel( int )</slot> <slot access="protected" specifier="pure virtual">panelDimensionsChanged()</slot> <slot specifier="pure virtual">switchPanel( int )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> </UI> diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index 63cdb35a9..ffbfc833e 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -33,7 +33,7 @@ #include <knuminput.h> #include <kpanelextension.h> #include <kpixmap.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include "main.h" @@ -72,7 +72,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name) /* * set the tooltips on the buttons properly for RTL langs */ - if (kapp->reverseLayout()) + if (tdeApp->reverseLayout()) { TQToolTip::add(locationTopRight, i18n("Top left")); TQToolTip::add(locationTop, i18n("Top center")); @@ -104,10 +104,10 @@ PositionTab::PositionTab(TQWidget *parent, const char* name) } // connections - connect(m_locationGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed())); - connect(m_xineramaScreenComboBox, TQT_SIGNAL(highlighted(int)), TQT_SIGNAL(changed())); + connect(m_locationGroup, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(changed())); + connect(m_xineramaScreenComboBox, TQ_SIGNAL(highlighted(int)), TQ_SIGNAL(changed())); - connect(m_identifyButton,TQT_SIGNAL(clicked()),TQT_SLOT(showIdentify())); + connect(m_identifyButton,TQ_SIGNAL(clicked()),TQ_SLOT(showIdentify())); for(int s=0; s < TQApplication::desktop()->numScreens(); s++) { /* populate the combobox for the available screens */ @@ -123,38 +123,38 @@ PositionTab::PositionTab(TQWidget *parent, const char* name) m_xineramaScreenLabel->hide(); } - connect(m_percentSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_percentSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_expandCheckBox, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed())); + connect(m_percentSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_percentSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_expandCheckBox, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed())); - connect(m_sizeGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed())); - connect(m_customSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_customSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); + connect(m_sizeGroup, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(changed())); + connect(m_customSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_customSpinbox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); m_desktopPreview = new KVirtualBGRenderer(0); - connect(m_desktopPreview, TQT_SIGNAL(imageDone(int)), - TQT_SLOT(slotBGPreviewReady(int))); - - connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()), - TQT_SLOT(infoUpdated())); - connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)), - TQT_SLOT(extensionAdded(ExtensionInfo*))); - connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)), - TQT_SLOT(extensionRemoved(ExtensionInfo*))); - connect(KickerConfig::the(), TQT_SIGNAL(extensionChanged(const TQString&)), - TQT_SLOT(extensionChanged(const TQString&))); - connect(KickerConfig::the(), TQT_SIGNAL(extensionAboutToChange(const TQString&)), - TQT_SLOT(extensionAboutToChange(const TQString&))); + connect(m_desktopPreview, TQ_SIGNAL(imageDone(int)), + TQ_SLOT(slotBGPreviewReady(int))); + + connect(KickerConfig::the(), TQ_SIGNAL(extensionInfoChanged()), + TQ_SLOT(infoUpdated())); + connect(KickerConfig::the(), TQ_SIGNAL(extensionAdded(ExtensionInfo*)), + TQ_SLOT(extensionAdded(ExtensionInfo*))); + connect(KickerConfig::the(), TQ_SIGNAL(extensionRemoved(ExtensionInfo*)), + TQ_SLOT(extensionRemoved(ExtensionInfo*))); + connect(KickerConfig::the(), TQ_SIGNAL(extensionChanged(const TQString&)), + TQ_SLOT(extensionChanged(const TQString&))); + connect(KickerConfig::the(), TQ_SIGNAL(extensionAboutToChange(const TQString&)), + TQ_SLOT(extensionAboutToChange(const TQString&))); // position tab tells hiding tab about extension selections and vice versa - connect(KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int)), - TQT_SLOT(jumpToPanel(int))); - connect(m_panelList, TQT_SIGNAL(activated(int)), - KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int))); - - connect(m_panelSize, TQT_SIGNAL(activated(int)), - TQT_SLOT(sizeChanged(int))); - connect(m_panelSize, TQT_SIGNAL(activated(int)), - TQT_SIGNAL(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(hidingPanelChanged(int)), + TQ_SLOT(jumpToPanel(int))); + connect(m_panelList, TQ_SIGNAL(activated(int)), + KickerConfig::the(), TQ_SIGNAL(positionPanelChanged(int))); + + connect(m_panelSize, TQ_SIGNAL(activated(int)), + TQ_SLOT(sizeChanged(int))); + connect(m_panelSize, TQ_SIGNAL(activated(int)), + TQ_SIGNAL(changed())); } PositionTab::~PositionTab() @@ -229,7 +229,7 @@ void PositionTab::movePanel(int whichButton) setPositionButtons(); return; } - m_panelAlign = kapp->reverseLayout() ? AlignRight : AlignLeft; + m_panelAlign = tdeApp->reverseLayout() ? AlignRight : AlignLeft; m_panelPos = PosTop; } else if (pushed == locationTop) @@ -249,38 +249,38 @@ void PositionTab::movePanel(int whichButton) setPositionButtons(); return; } - m_panelAlign = kapp->reverseLayout() ? AlignLeft : AlignRight; + m_panelAlign = tdeApp->reverseLayout() ? AlignLeft : AlignRight; m_panelPos = PosTop; } else if (pushed == locationLeftTop) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft])) { setPositionButtons(); return; } m_panelAlign = AlignLeft; - m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft; + m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft; } else if (pushed == locationLeft) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft])) { setPositionButtons(); return; } m_panelAlign = AlignCenter; - m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft; + m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft; } else if (pushed == locationLeftBottom) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosRight : PosLeft])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosRight : PosLeft])) { setPositionButtons(); return; } m_panelAlign = AlignRight; - m_panelPos = kapp->reverseLayout() ? PosRight : PosLeft; + m_panelPos = tdeApp->reverseLayout() ? PosRight : PosLeft; } else if (pushed == locationBottomLeft) { @@ -289,7 +289,7 @@ void PositionTab::movePanel(int whichButton) setPositionButtons(); return; } - m_panelAlign = kapp->reverseLayout() ? AlignRight : AlignLeft; + m_panelAlign = tdeApp->reverseLayout() ? AlignRight : AlignLeft; m_panelPos = PosBottom; } else if (pushed == locationBottom) @@ -309,38 +309,38 @@ void PositionTab::movePanel(int whichButton) setPositionButtons(); return; } - m_panelAlign = kapp->reverseLayout() ? AlignLeft : AlignRight; + m_panelAlign = tdeApp->reverseLayout() ? AlignLeft : AlignRight; m_panelPos = PosBottom; } else if (pushed == locationRightTop) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight])) { setPositionButtons(); return; } m_panelAlign = AlignLeft; - m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight; + m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight; } else if (pushed == locationRight) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight])) { setPositionButtons(); return; } m_panelAlign = AlignCenter; - m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight; + m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight; } else if (pushed == locationRightBottom) { - if (!(m_panelInfo->_allowedPosition[kapp->reverseLayout() ? PosLeft : PosRight])) + if (!(m_panelInfo->_allowedPosition[tdeApp->reverseLayout() ? PosLeft : PosRight])) { setPositionButtons(); return; } m_panelAlign = AlignRight; - m_panelPos = kapp->reverseLayout() ? PosLeft : PosRight; + m_panelPos = tdeApp->reverseLayout() ? PosLeft : PosRight; } lengthenPanel(-1); @@ -582,47 +582,47 @@ void PositionTab::setPositionButtons() { if (m_panelPos == PosTop) { if (m_panelAlign == AlignLeft) - kapp->reverseLayout() ? locationTopRight->setOn(true) : + tdeApp->reverseLayout() ? locationTopRight->setOn(true) : locationTopLeft->setOn(true); else if (m_panelAlign == AlignCenter) locationTop->setOn(true); else // if (m_panelAlign == AlignRight - kapp->reverseLayout() ? locationTopLeft->setOn(true) : + tdeApp->reverseLayout() ? locationTopLeft->setOn(true) : locationTopRight->setOn(true); } else if (m_panelPos == PosRight) { if (m_panelAlign == AlignLeft) - kapp->reverseLayout() ? locationLeftTop->setOn(true) : + tdeApp->reverseLayout() ? locationLeftTop->setOn(true) : locationRightTop->setOn(true); else if (m_panelAlign == AlignCenter) - kapp->reverseLayout() ? locationLeft->setOn(true) : + tdeApp->reverseLayout() ? locationLeft->setOn(true) : locationRight->setOn(true); else // if (m_panelAlign == AlignRight - kapp->reverseLayout() ? locationLeftBottom->setOn(true) : + tdeApp->reverseLayout() ? locationLeftBottom->setOn(true) : locationRightBottom->setOn(true); } else if (m_panelPos == PosBottom) { if (m_panelAlign == AlignLeft) - kapp->reverseLayout() ? locationBottomRight->setOn(true) : + tdeApp->reverseLayout() ? locationBottomRight->setOn(true) : locationBottomLeft->setOn(true); else if (m_panelAlign == AlignCenter) locationBottom->setOn(true); else // if (m_panelAlign == AlignRight - kapp->reverseLayout() ? locationBottomLeft->setOn(true) : + tdeApp->reverseLayout() ? locationBottomLeft->setOn(true) : locationBottomRight->setOn(true); } else // if (m_panelPos == PosLeft { if (m_panelAlign == AlignLeft) - kapp->reverseLayout() ? locationRightTop->setOn(true) : + tdeApp->reverseLayout() ? locationRightTop->setOn(true) : locationLeftTop->setOn(true); else if (m_panelAlign == AlignCenter) - kapp->reverseLayout() ? locationRight->setOn(true) : + tdeApp->reverseLayout() ? locationRight->setOn(true) : locationLeft->setOn(true); else // if (m_panelAlign == AlignRight - kapp->reverseLayout() ? locationRightBottom->setOn(true) : + tdeApp->reverseLayout() ? locationRightBottom->setOn(true) : locationLeftBottom->setOn(true); } @@ -696,11 +696,11 @@ void PositionTab::showIdentify() screenLabel->setFrameStyle(TQFrame::Panel); screenLabel->setFrameShadow(TQFrame::Plain); - screenLabel->setAlignment(Qt::AlignCenter); + screenLabel->setAlignment(TQt::AlignCenter); screenLabel->setNum(s + 1); // BUGLET: we should not allow the identification to be entered again // until the timer fires. - TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); + TQTimer::singleShot(1500, screenLabel, TQ_SLOT(close())); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); diff --git a/kcontrol/kicker/positiontab_impl.h b/kcontrol/kicker/positiontab_impl.h index 4740a8a61..31868fef9 100644 --- a/kcontrol/kicker/positiontab_impl.h +++ b/kcontrol/kicker/positiontab_impl.h @@ -29,7 +29,7 @@ class ExtensionInfo; class PositionTab : public PositionTabBase { - Q_OBJECT + TQ_OBJECT public: PositionTab(TQWidget *parent, const char* name = 0); |