From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knotes/knoteconfigdlg.cpp | 66 +++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'knotes/knoteconfigdlg.cpp') diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index a1238768b..a88337090 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -89,22 +89,22 @@ void KNoteConfigDlg::slotUpdateCaption() TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults ) { TQWidget *displayPage = new TQWidget(); - TQGridLayout *layout = new TQGridLayout( displayPage, 2, 2, + TQGridLayout *tqlayout = new TQGridLayout( displayPage, 2, 2, defaults ? marginHint() : 0, spacingHint() ); TQLabel *label_FgColor = new TQLabel( i18n("&Text color:"), displayPage, "label_FgColor" ); - layout->addWidget( label_FgColor, 0, 0 ); + tqlayout->addWidget( label_FgColor, 0, 0 ); KColorButton *kcfg_FgColor = new KColorButton( displayPage, "kcfg_FgColor" ); label_FgColor->setBuddy( kcfg_FgColor ); - layout->addWidget( kcfg_FgColor, 0, 1 ); + tqlayout->addWidget( kcfg_FgColor, 0, 1 ); TQLabel *label_BgColor = new TQLabel( i18n("&Background color:"), displayPage, "label_BgColor" ); - layout->addWidget( label_BgColor, 1, 0 ); + tqlayout->addWidget( label_BgColor, 1, 0 ); KColorButton *kcfg_BgColor = new KColorButton( displayPage, "kcfg_BgColor" ); label_BgColor->setBuddy( kcfg_BgColor ); - layout->addWidget( kcfg_BgColor, 1, 1 ); + tqlayout->addWidget( kcfg_BgColor, 1, 1 ); TQCheckBox *kcfg_ShowInTaskbar = new TQCheckBox( i18n("&Show note in taskbar"), displayPage, "kcfg_ShowInTaskbar" ); @@ -112,25 +112,25 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults ) if ( defaults ) { TQLabel *label_Width = new TQLabel( i18n("Default &width:"), displayPage, "label_Width" ); - layout->addWidget( label_Width, 2, 0 ); + tqlayout->addWidget( label_Width, 2, 0 ); KIntNumInput *kcfg_Width = new KIntNumInput( displayPage, "kcfg_Width" ); label_Width->setBuddy( kcfg_Width ); kcfg_Width->setRange( 50, 2000, 10, false ); - layout->addWidget( kcfg_Width, 2, 1 ); + tqlayout->addWidget( kcfg_Width, 2, 1 ); TQLabel *label_Height = new TQLabel( i18n("Default &height:"), displayPage, "label_Height" ); - layout->addWidget( label_Height, 3, 0 ); + tqlayout->addWidget( label_Height, 3, 0 ); KIntNumInput *kcfg_Height = new KIntNumInput( displayPage, "kcfg_Height" ); kcfg_Height->setRange( 50, 2000, 10, false ); label_Height->setBuddy( kcfg_Height ); - layout->addWidget( kcfg_Height, 3, 1 ); + tqlayout->addWidget( kcfg_Height, 3, 1 ); - layout->addWidget( kcfg_ShowInTaskbar, 4, 0 ); + tqlayout->addWidget( kcfg_ShowInTaskbar, 4, 0 ); } else - layout->addWidget( kcfg_ShowInTaskbar, 2, 0 ); + tqlayout->addWidget( kcfg_ShowInTaskbar, 2, 0 ); return displayPage; } @@ -138,36 +138,36 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults ) TQWidget *KNoteConfigDlg::makeEditorPage( bool defaults ) { TQWidget *editorPage = new TQWidget(); - TQGridLayout *layout = new TQGridLayout( editorPage, 4, 3, + TQGridLayout *tqlayout = new TQGridLayout( editorPage, 4, 3, defaults ? marginHint() : 0, spacingHint() ); TQLabel *label_TabSize = new TQLabel( i18n( "&Tab size:" ), editorPage, "label_TabSize" ); - layout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 ); + tqlayout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 ); KIntNumInput *kcfg_TabSize = new KIntNumInput( editorPage, "kcfg_TabSize" ); kcfg_TabSize->setRange( 0, 40, 1, false ); label_TabSize->setBuddy( kcfg_TabSize ); - layout->addWidget( kcfg_TabSize, 0, 2 ); + tqlayout->addWidget( kcfg_TabSize, 0, 2 ); TQCheckBox *kcfg_AutoIndent = new TQCheckBox( i18n("Auto &indent"), editorPage, "kcfg_AutoIndent" ); - layout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 ); + tqlayout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 ); TQCheckBox *kcfg_RichText = new TQCheckBox( i18n("&Rich text"), editorPage, "kcfg_RichText" ); - layout->addWidget( kcfg_RichText, 1, 2 ); + tqlayout->addWidget( kcfg_RichText, 1, 2 ); TQLabel *label_Font = new TQLabel( i18n("Text font:"), editorPage, "label_Font" ); - layout->addWidget( label_Font, 3, 0 ); + tqlayout->addWidget( label_Font, 3, 0 ); KFontRequester *kcfg_Font = new KFontRequester( editorPage, "kcfg_Font" ); - kcfg_Font->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); - layout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 ); + kcfg_Font->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + tqlayout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 ); TQLabel *label_TitleFont = new TQLabel( i18n("Title font:"), editorPage, "label_TitleFont" ); - layout->addWidget( label_TitleFont, 2, 0 ); + tqlayout->addWidget( label_TitleFont, 2, 0 ); KFontRequester *kcfg_TitleFont = new KFontRequester( editorPage, "kcfg_TitleFont" ); - kcfg_TitleFont->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); - layout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 ); + kcfg_TitleFont->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); + tqlayout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 ); return editorPage; } @@ -184,14 +184,14 @@ TQWidget *KNoteConfigDlg::makeDefaultsPage() TQWidget *KNoteConfigDlg::makeActionsPage() { TQWidget *actionsPage = new TQWidget(); - TQGridLayout *layout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() ); TQLabel *label_MailAction = new TQLabel( i18n("&Mail action:"), actionsPage, "label_MailAction" ); - layout->addWidget( label_MailAction, 0, 0 ); + tqlayout->addWidget( label_MailAction, 0, 0 ); KLineEdit *kcfg_MailAction = new KLineEdit( actionsPage, "kcfg_MailAction" ); label_MailAction->setBuddy( kcfg_MailAction ); - layout->addWidget( kcfg_MailAction, 0, 1 ); + tqlayout->addWidget( kcfg_MailAction, 0, 1 ); return actionsPage; } @@ -199,27 +199,27 @@ TQWidget *KNoteConfigDlg::makeActionsPage() TQWidget *KNoteConfigDlg::makeNetworkPage() { TQWidget *networkPage = new TQWidget(); - TQGridLayout *layout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() ); TQGroupBox *incoming = new TQHGroupBox( i18n("Incoming Notes"), networkPage ); - layout->addMultiCellWidget( incoming, 0, 0, 0, 1 ); + tqlayout->addMultiCellWidget( incoming, 0, 0, 0, 1 ); new TQCheckBox( i18n("Accept incoming notes"), incoming, "kcfg_ReceiveNotes" ); TQGroupBox *outgoing = new TQHGroupBox( i18n("Outgoing Notes"), networkPage ); - layout->addMultiCellWidget( outgoing, 1, 1, 0, 1 ); + tqlayout->addMultiCellWidget( outgoing, 1, 1, 0, 1 ); TQLabel *label_SenderID = new TQLabel( i18n("&Sender ID:"), outgoing, "label_SenderID" ); KLineEdit *kcfg_SenderID = new KLineEdit( outgoing, "kcfg_SenderID" ); label_SenderID->setBuddy( kcfg_SenderID ); TQLabel *label_Port = new TQLabel( i18n("&Port:"), networkPage, "label_Port" ); - layout->addWidget( label_Port, 2, 0 ); + tqlayout->addWidget( label_Port, 2, 0 ); KIntNumInput *kcfg_Port = new KIntNumInput( networkPage, "kcfg_Port" ); kcfg_Port->setRange( 0, 65535, 1, false ); label_Port->setBuddy( kcfg_Port ); - layout->addWidget( kcfg_Port, 2, 1 ); + tqlayout->addWidget( kcfg_Port, 2, 1 ); return networkPage; } @@ -227,17 +227,17 @@ TQWidget *KNoteConfigDlg::makeNetworkPage() TQWidget *KNoteConfigDlg::makeStylePage() { TQWidget *stylePage = new TQWidget(); - TQGridLayout *layout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() ); TQLabel *label_Style = new TQLabel( i18n("&Style:"), stylePage, "label_Style" ); - layout->addWidget( label_Style, 0, 0 ); + tqlayout->addWidget( label_Style, 0, 0 ); TQComboBox *kcfg_Style = new TQComboBox( stylePage, "kcfg_Style" ); TQStringList list; list << "Plain" << "Fancy"; kcfg_Style->insertStringList( list ); label_Style->setBuddy( kcfg_Style ); - layout->addWidget( kcfg_Style, 0, 1 ); + tqlayout->addWidget( kcfg_Style, 0, 1 ); return stylePage; } -- cgit v1.2.1