kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 08:51:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

addMultiCell(Widget|Layout|) => add(Widget|Layout|Item) with swapped params and with row/colspan instead of last row/col. This means that there are ~150 less deprecated warnings

Browse source 
svn path=/trunk/KDE/kdebase/konqueror/; revision=531845
This commit is contained in:
Reinhold Kainhofer 2006-04-20 12:41:37 +00:00
parent 4006c5ef2e
commit 8d2bed06f3
6 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
konqueror/settings/kio/smbrodlg.cpp
View file

@ -41,7 +41,7 @@ SMBRoOptions::SMBRoOptions(KInstance *inst, QWidget *parent)
QGridLayout *layout = new QGridLayout(this,2,-1,KDialog::marginHint(),
KDialog::spacingHint());
QLabel *label=new QLabel(i18n("This is the configuration for the samba client only, not the server."),this);
layout->addMultiCellWidget(label,0,0,0,1);
layout->addWidget(label,0,0, 1, 2 );
m_userLe=new QLineEdit(this);
label=new QLabel(m_userLe,i18n("Default user name:"),this);
@ -60,7 +60,7 @@ SMBRoOptions::SMBRoOptions(KInstance *inst, QWidget *parent)
layout->addWidget(m_workgroupLe,3,1);
m_showHiddenShares=new QCheckBox(i18n("Show hidden shares"),this);
layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1);*/
layout->addWidget(m_showHiddenShares,4,0, 1, 2 );*/
m_encodingList = new KComboBox( false, this );
QStringList _strList = KGlobal::charsets()->availableEncodingNames();

8
konqueror/settings/konq/fontopts.cpp
View file

@ -63,7 +63,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, QString group, bool desktop, K
m_pStandard = new KFontCombo( this );
label = new QLabel( m_pStandard, i18n("&Standard font:"), this );
lay->addWidget(label,row,0);
lay->addMultiCellWidget(m_pStandard,row,row,1,1);
lay->addWidget(m_pStandard,row,1, 1, 1);
wtstr = i18n("This is the font used to display text in Konqueror windows.");
label->setWhatsThis( wtstr );
@ -82,7 +82,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, QString group, bool desktop, K
m_pSize = new QSpinBox( 4,18,1,this );
label = new QLabel( m_pSize, i18n("Font si&ze:"), this );
lay->addWidget(label,row,0);
lay->addMultiCellWidget(m_pSize,row,row,1,1);
lay->addWidget(m_pSize,row,1, 1, 1);
connect( m_pSize, SIGNAL( valueChanged(int) ),
this, SLOT( slotFontSize(int) ) );
@ -183,7 +183,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, QString group, bool desktop, K
}
cbUnderline = new QCheckBox(i18n("&Underline filenames"), this);
lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,hAlign);
lay->addWidget(cbUnderline,row,0, 1,LASTCOLUMN+1,hAlign);
connect(cbUnderline, SIGNAL(clicked()), this, SLOT(changed()));
cbUnderline->setWhatsThis( i18n("Checking this option will result in filenames"
@ -196,7 +196,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, QString group, bool desktop, K
row++;
m_pSizeInBytes = new QCheckBox(i18n("Display file sizes in b&ytes"), this);
lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,hAlign );
lay->addWidget( m_pSizeInBytes,row,0, 1,LASTCOLUMN+1,hAlign );
connect( m_pSizeInBytes, SIGNAL(clicked()), this, SLOT(changed()) );
m_pSizeInBytes->setWhatsThis( i18n("Checking this option will result in file sizes"

6
konqueror/settings/konq/rootopts.cpp
View file

@ -79,7 +79,7 @@ DesktopPathConfig::DesktopPathConfig(KInstance *inst, QWidget *parent )
urDesktop = new KUrlRequester(this);
urDesktop->setMode( KFile::Directory );
tmpLabel->setBuddy( urDesktop );
lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL);
lay->addWidget(urDesktop, row, 1, 1, RO_LASTCOL);
connect(urDesktop, SIGNAL(textChanged(const QString &)), this, SLOT(changed()));
QString wtstr = i18n("This folder contains all the files"
" which you see on your desktop. You can change the location of this"
@ -94,7 +94,7 @@ DesktopPathConfig::DesktopPathConfig(KInstance *inst, QWidget *parent )
urAutostart = new KUrlRequester(this);
urAutostart->setMode( KFile::Directory );
tmpLabel->setBuddy( urAutostart );
lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL);
lay->addWidget(urAutostart, row, 1, 1, RO_LASTCOL);
connect(urAutostart, SIGNAL(textChanged(const QString &)), this, SLOT(changed()));
wtstr = i18n("This folder contains applications or"
" links to applications (shortcuts) that you want to have started"
@ -110,7 +110,7 @@ DesktopPathConfig::DesktopPathConfig(KInstance *inst, QWidget *parent )
urDocument = new KUrlRequester(this);
urDocument->setMode( KFile::Directory );
tmpLabel->setBuddy( urDocument );
lay->addMultiCellWidget(urDocument, row, row, 1, RO_LASTCOL);
lay->addWidget(urDocument, row, 1, 1, RO_LASTCOL);
connect(urDocument, SIGNAL(textChanged(const QString &)), this, SLOT(changed()));
wtstr = i18n("This folder will be used by default to "
"load or save documents from or to.");

20
konqueror/settings/konqhtml/appearance.cpp
View file

@ -43,7 +43,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, KInstance
int E = 0, M = 1, W = 3; //CT 3 (instead 2) allows smaller color buttons
Q3GroupBox* gb = new Q3GroupBox( 1, Qt::Horizontal, i18n("Font Si&ze"), this );
lay->addMultiCellWidget(gb, r, r, E, W);
lay->addWidget(gb, r, E, 1, W- E+1);
gb->setWhatsThis( i18n("This is the relative font size Konqueror uses to display web sites.") );
@ -72,7 +72,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, KInstance
m_pFonts[0] = new KFontCombo( emptyList, this );
label->setBuddy( m_pFonts[0] );
lay->addMultiCellWidget(m_pFonts[0], r, r, M, W);
lay->addWidget(m_pFonts[0], r, M, 1, W- M+1);
wtstr = i18n("This is the font used to display normal text in a web page.");
label->setWhatsThis( wtstr );
@ -93,7 +93,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, KInstance
m_pFonts[1] = new KFontCombo( emptyList, this );
label->setBuddy( m_pFonts[1] );
lay->addMultiCellWidget(m_pFonts[1], r, r, M, W);
lay->addWidget(m_pFonts[1], r, M, 1, W- M+1);
wtstr = i18n("This is the font used to display fixed-width (i.e. non-proportional) text.");
label->setWhatsThis( wtstr );
@ -114,7 +114,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, KInstance
m_pFonts[2] = new KFontCombo( emptyList, this );
label->setBuddy( m_pFonts[2] );
lay->addMultiCellWidget( m_pFonts[2], r, r, M, W );
lay->addWidget( m_pFonts[2], r, M, 1, W - M+1);
wtstr= i18n( "This is the font used to display text that is marked up as serif." );
label->setWhatsThis( wtstr );
@ -135,7 +135,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, KInstance
m_pFonts[3] = new KFontCombo( emptyList, this );
label->setBuddy( m_pFonts[3] );
lay->addMultiCellWidget( m_pFonts[3], r, r, M, W );
lay->addWidget( m_pFonts[3], r, M, 1, W - M+1);
wtstr= i18n( "This is the font used to display text that is marked up as sans-serif." );
label->setWhatsThis( wtstr );
@ -157,7 +157,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, KInstance
m_pFonts[4] = new KFontCombo( emptyList, this );
label->setBuddy( m_pFonts[4] );
lay->addMultiCellWidget( m_pFonts[4], r, r, M, W );
lay->addWidget( m_pFonts[4], r, M, 1, W - M+1);
wtstr= i18n( "This is the font used to display text that is marked up as italic." );
label->setWhatsThis( wtstr );
@ -179,7 +179,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, KInstance
m_pFonts[5] = new KFontCombo( emptyList, this );
label->setBuddy( m_pFonts[5] );
lay->addMultiCellWidget( m_pFonts[5], r, r, M, W );
lay->addWidget( m_pFonts[5], r, M, 1, W-M+1 );
wtstr= i18n( "This is the font used to display text that is marked up as a fantasy font." );
label->setWhatsThis( wtstr );
@ -200,7 +200,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, KInstance
m_pFontSizeAdjust = new QSpinBox( -5, 5, 1, this );
label->setBuddy( m_pFontSizeAdjust );
lay->addMultiCellWidget( m_pFontSizeAdjust, r, r, M+1, W );
lay->addWidget( m_pFontSizeAdjust, r, M+1, 1, W-M+2 );
connect( m_pFontSizeAdjust, SIGNAL( valueChanged( int ) ),
SLOT( slotFontSizeAdjust( int ) ) );
@ -209,7 +209,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, KInstance
label = new QLabel( i18n( "Default encoding:"), this );
//++r;
//lay->addMultiCellWidget( label, r, r, E, E+1);
//lay->addWidget( label, r, E, 1, 2 );
lay->addWidget( label, ++r, E);
m_pEncoding = new QComboBox( this );
@ -218,7 +218,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, QString group, KInstance
encodings = KGlobal::charsets()->availableEncodingNames();
encodings.prepend(i18n("Use Language Encoding"));
m_pEncoding->addItems( encodings );
lay->addMultiCellWidget(m_pEncoding,r, r, M, W);
lay->addWidget(m_pEncoding,r, M, 1, W- M+1);
wtstr = i18n( "Select the default encoding to be used; normally, you will be fine with 'Use language encoding' "
"and should not have to change this.");

2
konqueror/settings/konqhtml/domainlistview.cpp
View file

@ -52,7 +52,7 @@ DomainListView::DomainListView(KConfig *config,const QString &title,
connect(domainSpecificLV,SIGNAL(returnPressed(Q3ListViewItem *)), SLOT(changePressed()));
connect(domainSpecificLV, SIGNAL( executed( Q3ListViewItem *)), SLOT( updateButton()));
connect(domainSpecificLV, SIGNAL(selectionChanged()), SLOT(updateButton()));
thisLayout->addMultiCellWidget(domainSpecificLV, 0, 5, 0, 0);
thisLayout->addWidget(domainSpecificLV, 0, 0, 6, 1);
addDomainPB = new QPushButton(i18n("&New..."), this);
thisLayout->addWidget(addDomainPB, 0, 1);

16
konqueror/settings/konqhtml/htmlopts.cpp
View file

@ -61,7 +61,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, KInstance *in
" bookmarks in the bookmark toolbar which you have marked to do so in the bookmark editor." ) );
connect(m_pOnlyMarkedBookmarksCheckBox, SIGNAL(clicked()), SLOT(slotChanged()));
lay->addMultiCellWidget( bgBookmarks, row, row, 0, 1 );
lay->addWidget( bgBookmarks, row, 0, 1, 2 );
row++;
// Form completion
@ -83,7 +83,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, KInstance *in
i18n( "Here you can select how many values Konqueror will remember for a form field." ) );
connect(m_pMaxFormCompletionItems, SIGNAL(valueChanged(int)), SLOT(slotChanged()));
lay->addMultiCellWidget( bgForm, row, row, 0, 1 );
lay->addWidget( bgForm, row, 0, 1, 2 );
row++;
// Tabbed Browsing
@ -108,7 +108,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, KInstance *in
laytab->addStretch();
connect(advancedTabButton, SIGNAL(clicked()), this, SLOT(launchAdvancedTabDialog()));
lay->addMultiCellWidget( bgTabbedBrowsing, row, row, 0, 1 );
lay->addWidget( bgTabbedBrowsing, row, 0, 1, 2 );
row++;
// Mouse behavior
@ -137,7 +137,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, KInstance *in
"To access the context menu, press the right mouse button and move." ) );
connect(m_pBackRightClick, SIGNAL(clicked()), SLOT(slotChanged()));
lay->addMultiCellWidget( bgMouse, row, row, 0, 1 );
lay->addWidget( bgMouse, row, 0, 1, 2 );
row++;
// Misc
@ -151,7 +151,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, KInstance *in
" will probably want to check this box to enhance your browsing"
" experience." ) );
connect(m_pAutoLoadImagesCheckBox, SIGNAL(clicked()), SLOT(slotChanged()));
lay->addMultiCellWidget( m_pAutoLoadImagesCheckBox, row, row, 0, 1 );
lay->addWidget( m_pAutoLoadImagesCheckBox, row, 0, 1, 2 );
row++;
m_pUnfinishedImageFrameCheckBox = new QCheckBox( i18n( "Dra&w frame around not completely loaded images"), this );
@ -160,21 +160,21 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, QString group, KInstance *in
" in a web page.<br>Especially if you have a slow network connection, you will"
" probably want to check this box to enhance your browsing experience." ) );
connect(m_pUnfinishedImageFrameCheckBox, SIGNAL(clicked()), SLOT(slotChanged()));
lay->addMultiCellWidget( m_pUnfinishedImageFrameCheckBox, row, row, 0, 1 );
lay->addWidget( m_pUnfinishedImageFrameCheckBox, row, 0, 1, 2 );
row++;
m_pAutoRedirectCheckBox = new QCheckBox( i18n( "Allow automatic delayed &reloading/redirecting"), this );
m_pAutoRedirectCheckBox->setWhatsThis( i18n( "Some web pages request an automatic reload or redirection after"
" a certain period of time. By unchecking this box Konqueror will ignore these requests." ) );
connect(m_pAutoRedirectCheckBox, SIGNAL(clicked()), SLOT(slotChanged()));
lay->addMultiCellWidget( m_pAutoRedirectCheckBox, row, row, 0, 1 );
lay->addWidget( m_pAutoRedirectCheckBox, row, 0, 1, 2 );
row++;
// More misc
KSeparator *sep = new KSeparator(this);
lay->addMultiCellWidget(sep, row, row, 0, 1);
lay->addWidget(sep, row, 0, 1, 2 );
row++;
QLabel *label = new QLabel( i18n("Und&erline links:"), this);