Rename KIcon to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent fed45b4784
commit 3f26251087

@ -117,7 +117,7 @@ KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress,
label = new TQLabel( hbox );
TQ_CHECK_PTR( label );
label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "edit", TDEIcon::Small ) );
label->setSizePolicy( pol );
label = new TQLabel( i18n( " must be answered before a mail can be sent.") , hbox );
@ -343,7 +343,7 @@ KFeedbackQuestion::KFeedbackQuestion( KFeedbackQuestionList * parent,
{
if ( required )
{
setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "edit", TDEIcon::Small ) );
}
setOpen( open );

@ -357,9 +357,9 @@ KVpnc::~KVpnc()
void KVpnc::initAction()
{
disconnectedIcon = TDEGlobal::iconLoader() ->loadIcon ( "disconnected", KIcon::NoGroup, 22 );
connectedIcon = TDEGlobal::iconLoader() ->loadIcon ( "connected", KIcon::NoGroup, 22 );
connectingIcon = TDEGlobal::iconLoader() ->loadIcon ( "connecting", KIcon::NoGroup, 22 );
disconnectedIcon = TDEGlobal::iconLoader() ->loadIcon ( "disconnected", TDEIcon::NoGroup, 22 );
connectedIcon = TDEGlobal::iconLoader() ->loadIcon ( "connected", TDEIcon::NoGroup, 22 );
connectingIcon = TDEGlobal::iconLoader() ->loadIcon ( "connecting", TDEIcon::NoGroup, 22 );
setIcon ( disconnectedIcon );
( void* ) KStdAction::quit ( this, TQT_SLOT ( quitCalled() ), actionCollection() );

@ -49,10 +49,10 @@ KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok, true )
this->GlobalConfig = GlobalConfig;
this->app = app;
// TQPixmap info_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
// TQPixmap debug_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
// TQPixmap error_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
// TQPixmap debug_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
// TQPixmap info_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", TDEIcon::NoGroup, 16 );
// TQPixmap debug_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", TDEIcon::NoGroup, 16 );
// TQPixmap error_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", TDEIcon::NoGroup, 16 );
// TQPixmap debug_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", TDEIcon::NoGroup, 16 );
// InfoListView->setSorting(1);

@ -91,8 +91,8 @@ PreferencesDialog::PreferencesDialog( TQWidget *parent, TQApplication *app, TQTe
// programsInPathToggled(GlobalConfig->programsInPath);
//
ok_icon = TDEGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup, 16 );
wrong_icon = TDEGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
ok_icon = TDEGlobal::iconLoader() ->loadIcon( "button_ok", TDEIcon::NoGroup, 16 );
wrong_icon = TDEGlobal::iconLoader() ->loadIcon( "button_cancel", TDEIcon::NoGroup, 16 );
unfoldTreeList ();
if ( !showOnlyProfiles )
@ -945,7 +945,7 @@ void PreferencesDialog::setupGui()
TQStringList path;
path.clear();
path << i18n( "KVpnc" );
setFolderIcon ( path, SmallIcon( "application", KIcon::SizeSmall ) );
setFolderIcon ( path, SmallIcon( "application", TDEIcon::SizeSmall ) );
path.clear();
@ -957,7 +957,7 @@ void PreferencesDialog::setupGui()
// General page
path << i18n( "Application" ) << i18n( "General" );
GeneralFrame = addPage( path, i18n( "General" ), BarIcon( "kvpnc", KIcon::SizeSmall ) );
GeneralFrame = addPage( path, i18n( "General" ), BarIcon( "kvpnc", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( GeneralFrame, 0, KDialog::spacingHint() );
GeneralOptionsWidget = new ConfigGeneralOptions( GeneralFrame );
lo->addWidget( GeneralOptionsWidget );
@ -975,7 +975,7 @@ void PreferencesDialog::setupGui()
// Debug
path.clear();
path << i18n( "Application" ) << i18n( "Debug" );
DebugFrame = addPage( path, i18n( "Debug" ), BarIcon( "bug", KIcon::SizeSmall ) );
DebugFrame = addPage( path, i18n( "Debug" ), BarIcon( "bug", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( DebugFrame );
lo->setSpacing( KDialog::spacingHint() );
DebugOptionsWidget = new ConfigDebugOptions( DebugFrame, "Debug" );
@ -983,7 +983,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Application" ) << i18n( "Connect" );
ConfigConnectOptionsFrame = addPage( path, i18n( "Connect" ), BarIcon( "connecting", KIcon::SizeSmall ) );
ConfigConnectOptionsFrame = addPage( path, i18n( "Connect" ), BarIcon( "connecting", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ConfigConnectOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
ConnectOptionsWidget = new ConfigConnectOptions( ConfigConnectOptionsFrame );
@ -991,18 +991,18 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Application" ) << i18n( "Log" );
LogFrame = addPage( path, i18n( "Log" ), BarIcon( "text_center", KIcon::SizeSmall ) );
LogFrame = addPage( path, i18n( "Log" ), BarIcon( "text_center", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( LogFrame );
lo->setSpacing( KDialog::spacingHint() );
LogOptionsWidget = new ConfigLogOptions( LogFrame );
lo->addWidget( LogOptionsWidget );
path << i18n( "Programs" );
setFolderIcon ( path, SmallIcon( "kvpnc", KIcon::SizeSmall ) );
setFolderIcon ( path, SmallIcon( "kvpnc", TDEIcon::SizeSmall ) );
path.clear();
path << i18n( "Programs" ) << i18n( "Daemons" );
DaemonOptionsFrame = addVBoxPage( path, i18n( "Daemons" ), BarIcon( "fork", KIcon::SizeSmall ) );
DaemonOptionsFrame = addVBoxPage( path, i18n( "Daemons" ), BarIcon( "fork", TDEIcon::SizeSmall ) );
// DaemonOptionsFrame->resize(DaemonOptionsFrame->sizeHint());
// lo = new TQVBoxLayout( DaemonOptionsFrame );
DaemonScrollView = new TQScrollView(DaemonOptionsFrame, "daemonscrollview");
@ -1037,7 +1037,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Programs" ) << i18n( "Helper Programs" );
HelperProgramFrame = addPage( path, i18n( "Helper Programs" ), BarIcon( "tool", KIcon::SizeSmall ) );
HelperProgramFrame = addPage( path, i18n( "Helper Programs" ), BarIcon( "tool", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( HelperProgramFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1050,11 +1050,11 @@ void PreferencesDialog::setupGui()
// Profile page
path.clear();
path << i18n( "Profile" );
setFolderIcon ( path, SmallIcon( "view_icon", KIcon::SizeSmall ) );
setFolderIcon ( path, SmallIcon( "view_icon", TDEIcon::SizeSmall ) );
path.clear();
path << i18n( "Profile" ) << i18n( "General" );
ProfileGeneralOptionsFrame = addPage( path, i18n( "General" ), BarIcon( "application", KIcon::SizeSmall ) );
ProfileGeneralOptionsFrame = addPage( path, i18n( "General" ), BarIcon( "application", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileGeneralOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1074,7 +1074,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "User data" );
ProfileUserOptionsFrame = addPage( path, i18n( "User Data" ), BarIcon( "user", KIcon::SizeSmall ) );
ProfileUserOptionsFrame = addPage( path, i18n( "User Data" ), BarIcon( "user", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileUserOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1095,7 +1095,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "Certificate" );
ProfileCertOptionsFrame = addVBoxPage( path, i18n( "Certificate" ), BarIcon( "certimport", KIcon::SizeSmall ) );
ProfileCertOptionsFrame = addVBoxPage( path, i18n( "Certificate" ), BarIcon( "certimport", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileCertOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
TQWidget *ProfileCertSelectorWidget = new TQWidget( ProfileCertOptionsFrame );
@ -1115,7 +1115,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "Smartcard" );
ProfileSmartcardOptionsFrame = addPage( path, i18n( "Smartcard" ), BarIcon( "smartcard", KIcon::SizeSmall ) );
ProfileSmartcardOptionsFrame = addPage( path, i18n( "Smartcard" ), BarIcon( "smartcard", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileSmartcardOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1136,7 +1136,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Authenticate" ) << i18n( "PSK" );
ProfilePskOptionsFrame = addPage( path, i18n( "PSK" ), BarIcon( "password", KIcon::SizeSmall ) );
ProfilePskOptionsFrame = addPage( path, i18n( "PSK" ), BarIcon( "password", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfilePskOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1155,7 +1155,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "General" );
ProfileNetworkGeneralOptionsFrame = addPage( path, i18n( "General" ), BarIcon( "network", KIcon::SizeSmall ) );
ProfileNetworkGeneralOptionsFrame = addPage( path, i18n( "General" ), BarIcon( "network", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileNetworkGeneralOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1175,7 +1175,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "Routes" );
ProfileNetworkRouteOptionsFrame = addPage( path, i18n( "Routes" ), BarIcon( "route", KIcon::SizeSmall ) );
ProfileNetworkRouteOptionsFrame = addPage( path, i18n( "Routes" ), BarIcon( "route", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileNetworkRouteOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1195,7 +1195,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "NAT" );
ProfileNetworkNatOptionsFrame = addPage( path, i18n( "NAT" ), BarIcon( "application", KIcon::SizeSmall ) );
ProfileNetworkNatOptionsFrame = addPage( path, i18n( "NAT" ), BarIcon( "application", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileNetworkNatOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1215,7 +1215,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "HTTP proxy" );
ProfileNetworkHttpProxyOptionsFrame = addPage( path, i18n( "HTTP proxy" ), BarIcon( "application", KIcon::SizeSmall ) );
ProfileNetworkHttpProxyOptionsFrame = addPage( path, i18n( "HTTP proxy" ), BarIcon( "application", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileNetworkHttpProxyOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1236,7 +1236,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Network" ) << i18n( "Virtual IP" );
ProfileNetworkVirtualIpOptionsFrame = addPage( path, i18n( "Virtual IP" ), BarIcon( "application", KIcon::SizeSmall ) );
ProfileNetworkVirtualIpOptionsFrame = addPage( path, i18n( "Virtual IP" ), BarIcon( "application", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileNetworkVirtualIpOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1257,7 +1257,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Cisco" );
ProfileCiscoOptionsFrame = addPage( path, i18n( "Cisco" ), BarIcon( "cisco", KIcon::SizeSmall ) );
ProfileCiscoOptionsFrame = addPage( path, i18n( "Cisco" ), BarIcon( "cisco", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileCiscoOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1297,7 +1297,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Racoon" );
ProfileRacoonOptionsFrame = addPage( path, i18n( "Racoon" ), BarIcon( "kame", KIcon::SizeSmall ) );
ProfileRacoonOptionsFrame = addPage( path, i18n( "Racoon" ), BarIcon( "kame", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileRacoonOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1345,7 +1345,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Openswan/strongSwan" );
ProfileIpsecOptionsFrame = addPage( path, i18n( "Openswan/strongSwan" ), BarIcon( "openswan", KIcon::SizeSmall ) );
ProfileIpsecOptionsFrame = addPage( path, i18n( "Openswan/strongSwan" ), BarIcon( "openswan", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileIpsecOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1385,7 +1385,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "OpenVPN" );
ProfileOpenvpnOptionsFrame = addPage( path, i18n( "OpenVPN" ), BarIcon( "openvpn", KIcon::SizeSmall ) );
ProfileOpenvpnOptionsFrame = addPage( path, i18n( "OpenVPN" ), BarIcon( "openvpn", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileOpenvpnOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1405,7 +1405,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "PPTP/L2TP" );
ProfilePptpOptionsFrame = addPage( path, i18n( "PPTP/L2TP" ), BarIcon( "application", KIcon::SizeSmall ) );
ProfilePptpOptionsFrame = addPage( path, i18n( "PPTP/L2TP" ), BarIcon( "application", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfilePptpOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1425,7 +1425,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "Vtun" );
ProfileVtunOptionsFrame = addPage( path, i18n( "Vtun" ), BarIcon( "application", KIcon::SizeSmall ) );
ProfileVtunOptionsFrame = addPage( path, i18n( "Vtun" ), BarIcon( "application", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileVtunOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1445,7 +1445,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Connection specific" ) << i18n( "SSH" );
ProfileSshOptionsFrame = addPage( path, i18n( "SSH" ), BarIcon( "openssh", KIcon::SizeSmall ) );
ProfileSshOptionsFrame = addPage( path, i18n( "SSH" ), BarIcon( "openssh", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileSshOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1499,7 +1499,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Command Execution" ) << i18n( "Before Connect" );
ProfileCmdExecBeforeConnectOptionsFrame = addPage( path, i18n( "Before Connect" ), BarIcon( "exec", KIcon::SizeSmall ) );
ProfileCmdExecBeforeConnectOptionsFrame = addPage( path, i18n( "Before Connect" ), BarIcon( "exec", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileCmdExecBeforeConnectOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1519,7 +1519,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Command Execution" ) << i18n( "After Connect" );
ProfileCmdExecAfterConnectOptionsFrame = addPage( path, i18n( "After Connect" ), BarIcon( "exec", KIcon::SizeSmall ) );
ProfileCmdExecAfterConnectOptionsFrame = addPage( path, i18n( "After Connect" ), BarIcon( "exec", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileCmdExecAfterConnectOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1538,7 +1538,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Command Execution" ) << i18n( "Before Disconnect" );
ProfileCmdExecBeforeDisconnectOptionsFrame = addPage( path, i18n( "Before Disconnect" ), BarIcon( "exec", KIcon::SizeSmall ) );
ProfileCmdExecBeforeDisconnectOptionsFrame = addPage( path, i18n( "Before Disconnect" ), BarIcon( "exec", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileCmdExecBeforeDisconnectOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -1557,7 +1557,7 @@ void PreferencesDialog::setupGui()
path.clear();
path << i18n( "Profile" ) << i18n( "Command Execution" ) << i18n( "After Disconnect" );
ProfileCmdExecAfterDisconnectOptionsFrame = addPage( path, i18n( "Command Execute After Disconnect" ), BarIcon( "exec", KIcon::SizeSmall ) );
ProfileCmdExecAfterDisconnectOptionsFrame = addPage( path, i18n( "Command Execute After Disconnect" ), BarIcon( "exec", TDEIcon::SizeSmall ) );
lo = new TQVBoxLayout( ProfileCmdExecAfterDisconnectOptionsFrame );
lo->setSpacing( KDialog::spacingHint() );
@ -6645,8 +6645,8 @@ void PreferencesDialog::RacoonPathChanged( const TQString& )
ConfigDaemonOptionsWidget->RacoonVersionLineEdit->setText( RacoonInfo->Version );
TQPixmap ok_icon = TDEGlobal::iconLoader() ->loadIcon( "button_ok", KIcon::NoGroup );
TQPixmap wrong_icon = TDEGlobal::iconLoader() ->loadIcon( "button_cancel", KIcon::NoGroup );
TQPixmap ok_icon = TDEGlobal::iconLoader() ->loadIcon( "button_ok", TDEIcon::NoGroup );
TQPixmap wrong_icon = TDEGlobal::iconLoader() ->loadIcon( "button_cancel", TDEIcon::NoGroup );
if ( RacoonInfo->found )
ConfigDaemonOptionsWidget->RacoonStatePixmapLabel->setPixmap( ok_icon );

@ -41,8 +41,8 @@ ToolsInfoDialog::ToolsInfoDialog(KVpncConfig *GlobalConfig, TQWidget *parent, co
setMainWidget(main);
main->InfoListView->setMinimumSize(main->InfoListView->sizeHint());
TQPixmap ok_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
TQPixmap wrong_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
TQPixmap ok_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", TDEIcon::NoGroup, 16 );
TQPixmap wrong_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", TDEIcon::NoGroup, 16 );
ToolInfo *tool=0;
main->InfoListView->setSorting(1);

@ -102,8 +102,8 @@ VpnTypesInfoDialog::VpnTypesInfoDialog ( KVpncConfig *GlobalConfig, TQWidget *pa
main->textLabel1->setText(i18n("The following information about the VPN tyes has been collected:"));
TQPixmap ok_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", KIcon::NoGroup, 16 );
TQPixmap wrong_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", KIcon::NoGroup, 16 );
TQPixmap ok_icon = TDEGlobal::iconLoader()->loadIcon( "button_ok", TDEIcon::NoGroup, 16 );
TQPixmap wrong_icon = TDEGlobal::iconLoader()->loadIcon( "button_cancel", TDEIcon::NoGroup, 16 );
ToolInfo *tool=0;
main->InfoListView->setSorting(1);

Loading…
Cancel
Save