diff options
Diffstat (limited to 'src/sources')
-rw-r--r-- | src/sources/labelsource.cpp | 16 | ||||
-rw-r--r-- | src/sources/labelsourcePrefs.cpp | 18 | ||||
-rw-r--r-- | src/sources/labelsourcePrefs.ui | 6 | ||||
-rw-r--r-- | src/sources/sourceprefs.ui | 2 |
4 files changed, 21 insertions, 21 deletions
diff --git a/src/sources/labelsource.cpp b/src/sources/labelsource.cpp index d088cc7..d4d2182 100644 --- a/src/sources/labelsource.cpp +++ b/src/sources/labelsource.cpp @@ -50,8 +50,8 @@ void LabelSource::createSubPrefs(TQWidget* inParent){ connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mLabelSourcePrefs->colorButton, TQT_SLOT(setEnabled(bool))); connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mLabelSourcePrefs->fontLabel, TQT_SLOT(setEnabled(bool))); connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mLabelSourcePrefs->fontRequester, TQT_SLOT(setEnabled(bool))); - connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mLabelSourcePrefs->tqalignmentLabel, TQT_SLOT(setEnabled(bool))); - connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mLabelSourcePrefs->tqalignmentComboBox, TQT_SLOT(setEnabled(bool))); + connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mLabelSourcePrefs->alignmentLabel, TQT_SLOT(setEnabled(bool))); + connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mLabelSourcePrefs->alignmentComboBox, TQT_SLOT(setEnabled(bool))); addPrefs(mLabelSourcePrefs); } } @@ -62,14 +62,14 @@ void LabelSource::updatePrefsGUI(){ mLabelSourcePrefs->fontRequester->setFont(mLabel->font()); switch (mLabel->tqalignment()) { case TQt::AlignCenter: - mLabelSourcePrefs->tqalignmentComboBox->setCurrentItem(1); + mLabelSourcePrefs->alignmentComboBox->setCurrentItem(1); break; case TQt::AlignRight: - mLabelSourcePrefs->tqalignmentComboBox->setCurrentItem(2); + mLabelSourcePrefs->alignmentComboBox->setCurrentItem(2); break; default: // TQt::AlignLeft break; - mLabelSourcePrefs->tqalignmentComboBox->setCurrentItem(0); + mLabelSourcePrefs->alignmentComboBox->setCurrentItem(0); } } @@ -80,15 +80,15 @@ void LabelSource::setPrefsWidgetsEnabled(bool isEnabled, bool isShownOnApplet){ mLabelSourcePrefs->colorButton->setEnabled(isEnabled && isShownOnApplet); mLabelSourcePrefs->fontLabel->setEnabled(isEnabled && isShownOnApplet); mLabelSourcePrefs->fontRequester->setEnabled(isEnabled && isShownOnApplet); - mLabelSourcePrefs->tqalignmentLabel->setEnabled(isEnabled && isShownOnApplet); - mLabelSourcePrefs->tqalignmentComboBox->setEnabled(isEnabled && isShownOnApplet); + mLabelSourcePrefs->alignmentLabel->setEnabled(isEnabled && isShownOnApplet); + mLabelSourcePrefs->alignmentComboBox->setEnabled(isEnabled && isShownOnApplet); } void LabelSource::applyPrefs(){ TriggeredSource::applyPrefs(); // call apply prefs of the super class mLabel->setPaletteForegroundColor(mLabelSourcePrefs->colorButton->color()); mLabel->setFont(mLabelSourcePrefs->fontRequester->font()); - int alignID = mLabelSourcePrefs->tqalignmentComboBox->currentItem(); + int alignID = mLabelSourcePrefs->alignmentComboBox->currentItem(); TQt::AlignmentFlags align = TQt::AlignCenter; if(alignID == 0){ align = TQt::AlignLeft; diff --git a/src/sources/labelsourcePrefs.cpp b/src/sources/labelsourcePrefs.cpp index cd7eb47..4ff75fc 100644 --- a/src/sources/labelsourcePrefs.cpp +++ b/src/sources/labelsourcePrefs.cpp @@ -66,11 +66,11 @@ LabelSourcePrefs::LabelSourcePrefs( TQWidget* tqparent, const char* name, WFlags tqlayout18 = new TQHBoxLayout( 0, 0, 6, "tqlayout18"); - tqalignmentLabel = new TQLabel( defaultSourcePrefsFrame, "tqalignmentLabel" ); - tqlayout18->addWidget( tqalignmentLabel ); + alignmentLabel = new TQLabel( defaultSourcePrefsFrame, "alignmentLabel" ); + tqlayout18->addWidget( alignmentLabel ); - tqalignmentComboBox = new TQComboBox( FALSE, defaultSourcePrefsFrame, "tqalignmentComboBox" ); - tqlayout18->addWidget( tqalignmentComboBox ); + alignmentComboBox = new TQComboBox( FALSE, defaultSourcePrefsFrame, "alignmentComboBox" ); + tqlayout18->addWidget( alignmentComboBox ); spacer2 = new TQSpacerItem( 350, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); tqlayout18->addItem( spacer2 ); defaultSourcePrefsFrameLayout->addLayout( tqlayout18 ); @@ -100,11 +100,11 @@ void LabelSourcePrefs::languageChange() colorLabel->setText( tr2i18n( "Foreground color:" ) ); colorButton->setText( TQString() ); fontLabel->setText( tr2i18n( "Font:" ) ); - tqalignmentLabel->setText( tr2i18n( "Alignment:" ) ); - tqalignmentComboBox->clear(); - tqalignmentComboBox->insertItem( tr2i18n( "Left" ) ); - tqalignmentComboBox->insertItem( tr2i18n( "Center" ) ); - tqalignmentComboBox->insertItem( tr2i18n( "Right" ) ); + alignmentLabel->setText( tr2i18n( "Alignment:" ) ); + alignmentComboBox->clear(); + alignmentComboBox->insertItem( tr2i18n( "Left" ) ); + alignmentComboBox->insertItem( tr2i18n( "Center" ) ); + alignmentComboBox->insertItem( tr2i18n( "Right" ) ); } #include "labelsourcePrefs.moc" diff --git a/src/sources/labelsourcePrefs.ui b/src/sources/labelsourcePrefs.ui index 28af1e4..a7f49db 100644 --- a/src/sources/labelsourcePrefs.ui +++ b/src/sources/labelsourcePrefs.ui @@ -129,7 +129,7 @@ Taskbar visual settings</string> </property> <widget class="TQLabel"> <property name="name"> - <cstring>tqalignmentLabel</cstring> + <cstring>alignmentLabel</cstring> </property> <property name="text"> <string>Alignment:</string> @@ -152,7 +152,7 @@ Taskbar visual settings</string> </property> </item> <property name="name"> - <cstring>tqalignmentComboBox</cstring> + <cstring>alignmentComboBox</cstring> </property> </widget> <spacer> @@ -178,7 +178,7 @@ Taskbar visual settings</string> </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kfontrequester.h</includehint> diff --git a/src/sources/sourceprefs.ui b/src/sources/sourceprefs.ui index 5c69dfb..e063d39 100644 --- a/src/sources/sourceprefs.ui +++ b/src/sources/sourceprefs.ui @@ -123,5 +123,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> |