summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/flowlayout.cpp40
-rw-r--r--src/prefs.ui2
-rw-r--r--src/sources/labelsource.cpp16
-rw-r--r--src/sources/labelsourcePrefs.cpp18
-rw-r--r--src/sources/labelsourcePrefs.ui6
-rw-r--r--src/sources/sourceprefs.ui2
6 files changed, 42 insertions, 42 deletions
diff --git a/src/flowlayout.cpp b/src/flowlayout.cpp
index 9cc73b3..fb7223c 100644
--- a/src/flowlayout.cpp
+++ b/src/flowlayout.cpp
@@ -25,9 +25,9 @@
class FlowLayoutIterator :public TQGLayoutIterator{
public:
- FlowLayoutIterator( TQPtrList<TQLayoutItem>* tqlayoutItems ):
+ FlowLayoutIterator( TQPtrList<TQLayoutItem>* layoutItems ):
index(0),
- mLayoutItems(tqlayoutItems){
+ mLayoutItems(layoutItems){
}
uint count() const;
TQLayoutItem* current();
@@ -246,25 +246,25 @@ int FlowLayout::doLayoutHorizontal( const TQRect& rect, bool testOnly ){
int width = 0; // width of this column so far
int height = 0; // height of this column so far
TQPtrListIterator<TQLayoutItem> it(mLayoutItems);
- TQLayoutItem* tqlayoutItem;
+ TQLayoutItem* layoutItem;
TQPtrList<TQLayoutItem> column; // stores the items of one column
- while((tqlayoutItem = it.current()) != 0){
+ while((layoutItem = it.current()) != 0){
++it;
- //int nextY = y + tqlayoutItem->tqsizeHint().height() + spacing(); // next y
- int nextY = y + tqlayoutItem->tqsizeHint().height(); // next y
+ //int nextY = y + layoutItem->tqsizeHint().height() + spacing(); // next y
+ int nextY = y + layoutItem->tqsizeHint().height(); // next y
//if( nextY - spacing() > rect.bottom() && width > 0 ) {
if( nextY > rect.bottom() && width > 0 ) {
// next column
y = rect.y(); // reset y
x = x + width + spacing(); // new x
- //nextY = y + tqlayoutItem->tqsizeHint().height() + spacing(); // next y with changed y
- nextY = y + tqlayoutItem->tqsizeHint().height(); // next y with changed y
+ //nextY = y + layoutItem->tqsizeHint().height() + spacing(); // next y with changed y
+ nextY = y + layoutItem->tqsizeHint().height(); // next y with changed y
width = 0; // reset width for the next column
}
if(!testOnly){
- tqlayoutItem->setGeometry( TQRect( TQPoint( x, y ), tqlayoutItem->tqsizeHint() ) );
- column.append(tqlayoutItem);
- height += tqlayoutItem->tqsizeHint().height(); // add the height of the current item to the column height
+ layoutItem->setGeometry( TQRect( TQPoint( x, y ), layoutItem->tqsizeHint() ) );
+ column.append(layoutItem);
+ height += layoutItem->tqsizeHint().height(); // add the height of the current item to the column height
if( it.current() == 0 || nextY + it.current()->tqsizeHint().height() > rect.bottom() ){ // test it it's the last item (of this column)
// calculate real needed width
int rWidth = 0;
@@ -283,7 +283,7 @@ int FlowLayout::doLayoutHorizontal( const TQRect& rect, bool testOnly ){
}
}
y = nextY;
- width = TQMAX( width, tqlayoutItem->tqsizeHint().width() );
+ width = TQMAX( width, layoutItem->tqsizeHint().width() );
}
return x + width - rect.x(); // width
}
@@ -293,23 +293,23 @@ int FlowLayout::doLayoutVertical( const TQRect& rect, bool testOnly ){
int y = rect.y();
int height = 0; // height of this line so far
TQPtrListIterator<TQLayoutItem> it(mLayoutItems);
- TQLayoutItem* tqlayoutItem;
- while((tqlayoutItem = it.current() ) != 0){
+ TQLayoutItem* layoutItem;
+ while((layoutItem = it.current() ) != 0){
++it;
- //int nextX = x + tqlayoutItem->tqsizeHint().width() + spacing();
- int nextX = x + tqlayoutItem->tqsizeHint().width();
+ //int nextX = x + layoutItem->tqsizeHint().width() + spacing();
+ int nextX = x + layoutItem->tqsizeHint().width();
if(nextX - spacing() > rect.right() && height > 0) {
// next line
x = rect.x(); // reset x
//y = y + height + spacing(); // new y
y = y + height; // new y
- //nextX = x + tqlayoutItem->tqsizeHint().width() + spacing(); // next x
- nextX = x + tqlayoutItem->tqsizeHint().width(); // next x
+ //nextX = x + layoutItem->tqsizeHint().width() + spacing(); // next x
+ nextX = x + layoutItem->tqsizeHint().width(); // next x
height = 0; // reset height for the next line
}
- const int itemHeight = tqlayoutItem->tqsizeHint().height();
+ const int itemHeight = layoutItem->tqsizeHint().height();
if(!testOnly)
- tqlayoutItem->setGeometry(TQRect(x, y, rect.right(), itemHeight));
+ layoutItem->setGeometry(TQRect(x, y, rect.right(), itemHeight));
x = nextX;
height = TQMAX(height, itemHeight);
}
diff --git a/src/prefs.ui b/src/prefs.ui
index 832b144..1351d96 100644
--- a/src/prefs.ui
+++ b/src/prefs.ui
@@ -65,7 +65,7 @@
</widget>
</vbox>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>
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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 06:39:26 +0000