summaryrefslogtreecommitdiffstats
path: root/twin/kcmtwin/twindecoration/twindecoration.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'twin/kcmtwin/twindecoration/twindecoration.cpp')
-rw-r--r--twin/kcmtwin/twindecoration/twindecoration.cpp143
1 files changed, 70 insertions, 73 deletions
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index 79a72aafd..265fe2a1c 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -98,7 +98,7 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
pluginLayout->addWidget(decorationList);
TQGroupBox *pluginSettingsGrp = new TQGroupBox( i18n("Decoration Options"), pluginPage );
- pluginSettingsGrp->setColumnLayout( 0, Qt::Vertical );
+ pluginSettingsGrp->setColumnLayout( 0, TQt::Vertical );
pluginSettingsGrp->setFlat( true );
pluginSettingsGrp->layout()->setMargin( 0 );
pluginSettingsGrp->layout()->setSpacing( KDialog::spacingHint() );
@@ -184,77 +184,77 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
i18n("Enabling this checkbox will allow you to choose a kind of "
"drop shadow to draw under each window."));
- activeShadowSettings = new TQGroupBox(1, Qt::Horizontal,
+ activeShadowSettings = new TQGroupBox(1, TQt::Horizontal,
i18n("Active Window Shadow"), shadowPage);
- inactiveShadowSettings = new TQGroupBox(1, Qt::Horizontal,
+ inactiveShadowSettings = new TQGroupBox(1, TQt::Horizontal,
i18n("Inactive Window Shadows"), shadowPage);
- whichShadowSettings = new TQGroupBox(3, Qt::Horizontal,
- i18n("Draw Shadow Under Normal Windows And..."), shadowPage);
+ whichShadowSettings = new TQGroupBox(3, TQt::Horizontal,
+ i18n("Draw Shadow Under Normal Windows And…"), shadowPage);
cbShadowDocks = new TQCheckBox(i18n("Docks and &panels"),
whichShadowSettings);
- connect(cbShadowDocks, TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(slotSelectionChanged()));
+ connect(cbShadowDocks, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(slotSelectionChanged()));
cbShadowOverrides = new TQCheckBox(i18n("O&verride windows"),
whichShadowSettings);
- connect(cbShadowOverrides, TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(slotSelectionChanged()));
+ connect(cbShadowOverrides, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(slotSelectionChanged()));
cbShadowTopMenus = new TQCheckBox(i18n("&Top menu"),
whichShadowSettings);
- connect(cbShadowTopMenus, TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(slotSelectionChanged()));
+ connect(cbShadowTopMenus, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(slotSelectionChanged()));
cbInactiveShadow = new TQCheckBox(
i18n("Draw shadow under &inactive windows"), inactiveShadowSettings);
- connect(cbInactiveShadow, TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(slotSelectionChanged()));
+ connect(cbInactiveShadow, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(slotSelectionChanged()));
shadowColourHBox = new TQHBox(activeShadowSettings);
shadowColourHBox->setSpacing(KDialog::spacingHint());
shadowColourLabel = new TQLabel(i18n("Colour:"), shadowColourHBox);
shadowColourButton = new KColorButton(shadowColourHBox);
- connect(shadowColourButton, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotSelectionChanged()));
+ connect(shadowColourButton, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotSelectionChanged()));
inactiveShadowColourHBox = new TQHBox(inactiveShadowSettings);
inactiveShadowColourHBox->setSpacing(KDialog::spacingHint());
inactiveShadowColourLabel = new TQLabel(i18n("Colour:"), inactiveShadowColourHBox);
inactiveShadowColourButton = new KColorButton(inactiveShadowColourHBox);
- connect(inactiveShadowColourButton, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotSelectionChanged()));
+ connect(inactiveShadowColourButton, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotSelectionChanged()));
shadowOpacityHBox = new TQHBox(activeShadowSettings);
shadowOpacityHBox->setSpacing(KDialog::spacingHint());
shadowOpacityLabel = new TQLabel(i18n("Maximum opacity:"), shadowOpacityHBox);
- shadowOpacitySlider = new TQSlider(1, 100, 10, 50, Qt::Horizontal,
+ shadowOpacitySlider = new TQSlider(1, 100, 10, 50, TQt::Horizontal,
shadowOpacityHBox);
shadowOpacitySlider->setTickmarks(TQSlider::Below);
shadowOpacitySlider->setTickInterval(10);
shadowOpacitySpinBox = new TQSpinBox(1, 100, 1, shadowOpacityHBox);
shadowOpacitySpinBox->setSuffix(" %");
- connect(shadowOpacitySlider, TQT_SIGNAL(valueChanged(int)), shadowOpacitySpinBox,
- TQT_SLOT(setValue(int)));
- connect(shadowOpacitySpinBox, TQT_SIGNAL(valueChanged(int)), shadowOpacitySlider,
- TQT_SLOT(setValue(int)));
- connect(shadowOpacitySlider, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotSelectionChanged()));
+ connect(shadowOpacitySlider, TQ_SIGNAL(valueChanged(int)), shadowOpacitySpinBox,
+ TQ_SLOT(setValue(int)));
+ connect(shadowOpacitySpinBox, TQ_SIGNAL(valueChanged(int)), shadowOpacitySlider,
+ TQ_SLOT(setValue(int)));
+ connect(shadowOpacitySlider, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotSelectionChanged()));
inactiveShadowOpacityHBox = new TQHBox(inactiveShadowSettings);
inactiveShadowOpacityHBox->setSpacing(KDialog::spacingHint());
inactiveShadowOpacityLabel = new TQLabel(i18n("Maximum opacity:"),
inactiveShadowOpacityHBox);
- inactiveShadowOpacitySlider = new TQSlider(1, 100, 10, 50, Qt::Horizontal,
+ inactiveShadowOpacitySlider = new TQSlider(1, 100, 10, 50, TQt::Horizontal,
inactiveShadowOpacityHBox);
inactiveShadowOpacitySlider->setTickmarks(TQSlider::Below);
inactiveShadowOpacitySlider->setTickInterval(10);
inactiveShadowOpacitySpinBox = new TQSpinBox(1, 100, 1,
inactiveShadowOpacityHBox);
inactiveShadowOpacitySpinBox->setSuffix(" %");
- connect(inactiveShadowOpacitySlider, TQT_SIGNAL(valueChanged(int)),
+ connect(inactiveShadowOpacitySlider, TQ_SIGNAL(valueChanged(int)),
inactiveShadowOpacitySpinBox,
- TQT_SLOT(setValue(int)));
- connect(inactiveShadowOpacitySpinBox, TQT_SIGNAL(valueChanged(int)),
+ TQ_SLOT(setValue(int)));
+ connect(inactiveShadowOpacitySpinBox, TQ_SIGNAL(valueChanged(int)),
inactiveShadowOpacitySlider,
- TQT_SLOT(setValue(int)));
- connect(inactiveShadowOpacitySlider, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotSelectionChanged()));
+ TQ_SLOT(setValue(int)));
+ connect(inactiveShadowOpacitySlider, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotSelectionChanged()));
shadowXOffsetHBox = new TQHBox(activeShadowSettings);
shadowXOffsetHBox->setSpacing(KDialog::spacingHint());
@@ -263,8 +263,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
shadowXOffsetHBox);
shadowXOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, shadowXOffsetHBox);
shadowXOffsetSpinBox->setSuffix(i18n(" pixels"));
- connect(shadowXOffsetSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotSelectionChanged()));
+ connect(shadowXOffsetSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotSelectionChanged()));
inactiveShadowXOffsetHBox = new TQHBox(inactiveShadowSettings);
inactiveShadowXOffsetHBox->setSpacing(KDialog::spacingHint());
@@ -274,8 +274,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
inactiveShadowXOffsetSpinBox = new TQSpinBox(-1024, 1024, 1,
inactiveShadowXOffsetHBox);
inactiveShadowXOffsetSpinBox->setSuffix(i18n(" pixels"));
- connect(inactiveShadowXOffsetSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotSelectionChanged()));
+ connect(inactiveShadowXOffsetSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotSelectionChanged()));
shadowYOffsetHBox = new TQHBox(activeShadowSettings);
shadowYOffsetHBox->setSpacing(KDialog::spacingHint());
@@ -284,8 +284,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
shadowYOffsetHBox);
shadowYOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, shadowYOffsetHBox);
shadowYOffsetSpinBox->setSuffix(i18n(" pixels"));
- connect(shadowYOffsetSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotSelectionChanged()));
+ connect(shadowYOffsetSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotSelectionChanged()));
inactiveShadowYOffsetHBox = new TQHBox(inactiveShadowSettings);
inactiveShadowYOffsetHBox->setSpacing(KDialog::spacingHint());
@@ -295,8 +295,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
inactiveShadowYOffsetSpinBox = new TQSpinBox(-1024, 1024, 1,
inactiveShadowYOffsetHBox);
inactiveShadowYOffsetSpinBox->setSuffix(i18n(" pixels"));
- connect(inactiveShadowYOffsetSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotSelectionChanged()));
+ connect(inactiveShadowYOffsetSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotSelectionChanged()));
shadowThicknessHBox = new TQHBox(activeShadowSettings);
shadowThicknessHBox->setSpacing(KDialog::spacingHint());
@@ -306,8 +306,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
shadowThicknessSpinBox = new TQSpinBox(1, 100, 1,
shadowThicknessHBox);
shadowThicknessSpinBox->setSuffix(i18n(" pixels"));
- connect(shadowThicknessSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotSelectionChanged()));
+ connect(shadowThicknessSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotSelectionChanged()));
inactiveShadowThicknessHBox = new TQHBox(inactiveShadowSettings);
inactiveShadowThicknessHBox->setSpacing(KDialog::spacingHint());
@@ -317,8 +317,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
inactiveShadowThicknessSpinBox = new TQSpinBox(1, 100, 1,
inactiveShadowThicknessHBox);
inactiveShadowThicknessSpinBox->setSuffix(i18n(" pixels"));
- connect(inactiveShadowThicknessSpinBox, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotSelectionChanged()));
+ connect(inactiveShadowThicknessSpinBox, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotSelectionChanged()));
// Page 4 (WM selector)
windowmanagerPage = new TQWidget( tabWidget );
@@ -355,25 +355,25 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
tabWidget->insertTab( shadowPage, i18n("&Shadows") );
tabWidget->insertTab( windowmanagerPage, i18n("&Window Manager") );
- connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotButtonsChanged()) ); // update preview etc.
- connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) ); // emit changed()...
- connect( decorationList, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotSelectionChanged()) );
- connect( decorationList, TQT_SIGNAL(activated(const TQString&)),
- TQT_SLOT(slotChangeDecoration(const TQString&)) );
- connect( cbUseCustomButtonPositions, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
- connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), buttonPositionWidget, TQT_SLOT(setEnabled(bool)));
- connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotButtonsChanged()) );
- connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), activeShadowSettings, TQT_SLOT(setEnabled(bool)));
- connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), inactiveShadowSettings, TQT_SLOT(setEnabled(bool)));
- connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), whichShadowSettings, TQT_SLOT(setEnabled(bool)));
-
- connect( cbShowToolTips, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
- connect( cbWindowShadow, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
- connect( cBorder, TQT_SIGNAL( activated( int )), TQT_SLOT( slotBorderChanged( int )));
-// connect( cbUseMiniWindows, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
-
- connect( thirdpartyWMList, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotSelectionChanged()) );
- connect( thirdpartyWMArguments, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSelectionChanged()) );
+ connect( buttonPositionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(slotButtonsChanged()) ); // update preview etc.
+ connect( buttonPositionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(slotSelectionChanged()) ); // emit changed()...
+ connect( decorationList, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotSelectionChanged()) );
+ connect( decorationList, TQ_SIGNAL(activated(const TQString&)),
+ TQ_SLOT(slotChangeDecoration(const TQString&)) );
+ connect( cbUseCustomButtonPositions, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+ connect(cbUseCustomButtonPositions, TQ_SIGNAL(toggled(bool)), buttonPositionWidget, TQ_SLOT(setEnabled(bool)));
+ connect(cbUseCustomButtonPositions, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotButtonsChanged()) );
+ connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), activeShadowSettings, TQ_SLOT(setEnabled(bool)));
+ connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), inactiveShadowSettings, TQ_SLOT(setEnabled(bool)));
+ connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), whichShadowSettings, TQ_SLOT(setEnabled(bool)));
+
+ connect( cbShowToolTips, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+ connect( cbWindowShadow, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+ connect( cBorder, TQ_SIGNAL( activated( int )), TQ_SLOT( slotBorderChanged( int )));
+// connect( cbUseMiniWindows, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+
+ connect( thirdpartyWMList, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotSelectionChanged()) );
+ connect( thirdpartyWMArguments, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSelectionChanged()) );
// Allow twin dcop signal to update our selection list
connectDCOPSignal("twin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false);
@@ -414,7 +414,7 @@ void KWinDecorationModule::findDecorations()
KDesktopFile desktopFile(filename);
TQString libName = desktopFile.readEntry("X-TDE-Library");
- if (!libName.isEmpty() && libName.startsWith( "twin3_" ))
+ if (!libName.isEmpty() && libName.startsWith("twin_") || libName.startsWith("twin3_"))
{
DecorationInfo di;
di.name = desktopFile.readName();
@@ -614,7 +614,7 @@ TQString KWinDecorationModule::decorationLibName( const TQString& name )
void KWinDecorationModule::resetPlugin( TDEConfig* conf, const TQString& currentDecoName )
{
// Config names are "twin_icewm_config"
- // for "twin3_icewm" twin client
+ // for "twin_icewm" twin client
TQString oldName = styleToConfigLib( oldLibraryName );
@@ -660,10 +660,10 @@ void KWinDecorationModule::resetPlugin( TDEConfig* conf, const TQString& current
pluginObject = (TQObject*)(allocatePlugin( conf, pluginConfigWidget ));
// connect required signals and slots together...
- connect( pluginObject, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) );
- connect( this, TQT_SIGNAL(pluginLoad(TDEConfig*)), pluginObject, TQT_SLOT(load(TDEConfig*)) );
- connect( this, TQT_SIGNAL(pluginSave(TDEConfig*)), pluginObject, TQT_SLOT(save(TDEConfig*)) );
- connect( this, TQT_SIGNAL(pluginDefaults()), pluginObject, TQT_SLOT(defaults()) );
+ connect( pluginObject, TQ_SIGNAL(changed()), this, TQ_SLOT(slotSelectionChanged()) );
+ connect( this, TQ_SIGNAL(pluginLoad(TDEConfig*)), pluginObject, TQ_SLOT(load(TDEConfig*)) );
+ connect( this, TQ_SIGNAL(pluginSave(TDEConfig*)), pluginObject, TQ_SLOT(save(TDEConfig*)) );
+ connect( this, TQ_SIGNAL(pluginDefaults()), pluginObject, TQ_SLOT(defaults()) );
pluginConfigWidget->show();
return;
}
@@ -895,7 +895,7 @@ void KWinDecorationModule::defaults()
border_size = BorderNormal;
checkSupportedBorderSizes();
- shadowColourButton->setColor(Qt::black);
+ shadowColourButton->setColor(TQt::black);
shadowOpacitySlider->setValue(70);
shadowXOffsetSpinBox->setValue(0);
shadowYOffsetSpinBox->setValue(10);
@@ -904,7 +904,7 @@ void KWinDecorationModule::defaults()
cbShadowOverrides->setChecked(false);
cbShadowTopMenus->setChecked(false);
cbInactiveShadow->setChecked(false);
- inactiveShadowColourButton->setColor(Qt::black);
+ inactiveShadowColourButton->setColor(TQt::black);
inactiveShadowOpacitySlider->setValue(70);
inactiveShadowXOffsetSpinBox->setValue(0);
inactiveShadowYOffsetSpinBox->setValue(5);
@@ -938,10 +938,7 @@ void KWinDecorationModule::checkSupportedBorderSizes()
TQString KWinDecorationModule::styleToConfigLib( TQString& styleLib )
{
- if( styleLib.startsWith( "twin3_" ))
- return "twin_" + styleLib.mid( 6 ) + "_config";
- else
- return styleLib + "_config";
+ return styleLib + "_config";
}
TQString KWinDecorationModule::quickHelp() const
@@ -951,7 +948,7 @@ TQString KWinDecorationModule::quickHelp() const
"as well as titlebar button positions and custom decoration options.</p>"
"To choose a theme for your window decoration click on its name and apply your choice by clicking the \"Apply\" button below."
" If you do not want to apply your choice you can click the \"Reset\" button to discard your changes."
- "<p>You can configure each theme in the \"Configure [...]\" tab. There are different options specific for each theme.</p>"
+ "<p>You can configure each theme in the \"Configure […]\" tab. There are different options specific for each theme.</p>"
"<p>In \"General Options (if available)\" you can activate the \"Buttons\" tab by checking the \"Use custom titlebar button positions\" box."
" In the \"Buttons\" tab you can change the positions of the buttons to your liking.</p>" );
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 04:10:17 +0000