From 516ce728ff4ffd1d1d78db856f167d180347dc02 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 00:40:29 -0600 Subject: Fix accidental networtde renames --- kopete/protocols/irc/ircprotocol.cpp | 2 +- kopete/protocols/irc/ui/CMakeLists.txt | 2 +- kopete/protocols/irc/ui/Makefile.am | 2 +- kopete/protocols/irc/ui/networkconfig.ui | 382 +++++++++++++++++++++++++++ kopete/protocols/irc/ui/networkconfig.ui.h | 26 ++ kopete/protocols/irc/ui/networtdeconfig.ui | 382 --------------------------- kopete/protocols/irc/ui/networtdeconfig.ui.h | 26 -- 7 files changed, 411 insertions(+), 411 deletions(-) create mode 100644 kopete/protocols/irc/ui/networkconfig.ui create mode 100644 kopete/protocols/irc/ui/networkconfig.ui.h delete mode 100644 kopete/protocols/irc/ui/networtdeconfig.ui delete mode 100644 kopete/protocols/irc/ui/networtdeconfig.ui.h (limited to 'kopete/protocols') diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index 9c6b9df4..8c8e6291 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -23,7 +23,7 @@ #include "ircchannelcontact.h" #include "irccontactmanager.h" -#include "networtdeconfig.h" +#include "networkconfig.h" #include "channellist.h" #include "ircguiclient.h" #include "ircusercontact.h" diff --git a/kopete/protocols/irc/ui/CMakeLists.txt b/kopete/protocols/irc/ui/CMakeLists.txt index d90cdd65..7d77d5b8 100644 --- a/kopete/protocols/irc/ui/CMakeLists.txt +++ b/kopete/protocols/irc/ui/CMakeLists.txt @@ -26,5 +26,5 @@ include_directories( tde_add_library( kopeteircui STATIC_PIC AUTOMOC SOURCES ircadd.ui empty.cpp irceditaccountwidget.cpp irceditaccount.ui - channellist.cpp channellistdialog.cpp networtdeconfig.ui + channellist.cpp channellistdialog.cpp networkconfig.ui ) diff --git a/kopete/protocols/irc/ui/Makefile.am b/kopete/protocols/irc/ui/Makefile.am index b31b75ea..854a7398 100644 --- a/kopete/protocols/irc/ui/Makefile.am +++ b/kopete/protocols/irc/ui/Makefile.am @@ -8,5 +8,5 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) \ libkopeteircui_la_SOURCES = ircadd.ui empty.cpp irceditaccountwidget.cpp \ - irceditaccount.ui channellist.cpp channellistdialog.cpp networtdeconfig.ui + irceditaccount.ui channellist.cpp channellistdialog.cpp networkconfig.ui EXTRA_DIST = ircadd.ui ircprefs.ui empty.cpp diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networkconfig.ui new file mode 100644 index 00000000..09121e54 --- /dev/null +++ b/kopete/protocols/irc/ui/networkconfig.ui @@ -0,0 +1,382 @@ + +NetworkConfig + + + NetworkConfig + + + + 0 + 0 + 670 + 468 + + + + Network Configuration + + + + unnamed + + + + description + + + + + textLabel10 + + + + 1 + 5 + 0 + 0 + + + + &Description: + + + description + + + + + groupBox2 + + + + 3 + 3 + 0 + 0 + + + + 4 + + + Host Con&figuration + + + + unnamed + + + + hostList + + + + 3 + 3 + 0 + 0 + + + + The IRC servers associated with this network + + + The IRC servers associated with this network. Use the up and down buttons to alter the order in which connections are attempted. + + + + + password + + + Password + + + Most IRC servers do not require a password + + + + + textLabel6 + + + Por&t: + + + port + + + + + port + + + 65536 + + + 1 + + + 6667 + + + + + textLabel4 + + + &Password: + + + password + + + + + textLabel5 + + + &Host: + + + host + + + + + host + + + true + + + + + + + + useSSL + + + Use SS&L + + + Check this to enable SSL for this connection + + + + + removeHost + + + + 1 + 0 + 0 + 0 + + + + &Remove + + + + + newHost + + + + 1 + 0 + 0 + 0 + + + + &New... + + + + + spacer3 + + + Horizontal + + + Expanding + + + + 210 + 20 + + + + + + downButton + + + false + + + Down + + + Move this server down + + + Move this server down in connection attempt priority + + + + + spacer4 + + + Vertical + + + Expanding + + + + 20 + 151 + + + + + + upButton + + + false + + + Up + + + Move this server up + + + Move this server up in connection attempt priority + + + + + + + cancelButton + + + &Cancel + + + + + saveButton + + + &Save + + + + + newNetwork + + + Ne&w + + + + + networkList + + + + 3 + 7 + 0 + 0 + + + + + + spacer5 + + + Horizontal + + + Expanding + + + + 260 + 20 + + + + + + renameNetwork + + + Rena&me... + + + + + removeNetwork + + + Remo&ve + + + + + + + cancelButton + clicked() + NetworkConfig + reject() + + + saveButton + clicked() + NetworkConfig + accept() + + + + networkList + newNetwork + renameNetwork + removeNetwork + description + hostList + upButton + downButton + host + port + password + useSSL + newHost + removeHost + saveButton + cancelButton + + + accepted() + rejected() + + + accept() + reject() + + + diff --git a/kopete/protocols/irc/ui/networkconfig.ui.h b/kopete/protocols/irc/ui/networkconfig.ui.h new file mode 100644 index 00000000..183ba57f --- /dev/null +++ b/kopete/protocols/irc/ui/networkconfig.ui.h @@ -0,0 +1,26 @@ +/**************************************************************************** +** ui.h extension file, included from the uic-generated form implementation. +** +** If you wish to add, delete or rename functions or slots use +** TQt Designer which will update this file, preserving your code. Create an +** init() function in place of a constructor, and a destroy() function in +** place of a destructor. +*****************************************************************************/ + + + + + + +void NetworkConfig::accept() +{ + emit accepted(); + TQDialog::accept(); +} + + +void NetworkConfig::reject() +{ + emit rejected(); + TQDialog::reject(); +} diff --git a/kopete/protocols/irc/ui/networtdeconfig.ui b/kopete/protocols/irc/ui/networtdeconfig.ui deleted file mode 100644 index 09121e54..00000000 --- a/kopete/protocols/irc/ui/networtdeconfig.ui +++ /dev/null @@ -1,382 +0,0 @@ - -NetworkConfig - - - NetworkConfig - - - - 0 - 0 - 670 - 468 - - - - Network Configuration - - - - unnamed - - - - description - - - - - textLabel10 - - - - 1 - 5 - 0 - 0 - - - - &Description: - - - description - - - - - groupBox2 - - - - 3 - 3 - 0 - 0 - - - - 4 - - - Host Con&figuration - - - - unnamed - - - - hostList - - - - 3 - 3 - 0 - 0 - - - - The IRC servers associated with this network - - - The IRC servers associated with this network. Use the up and down buttons to alter the order in which connections are attempted. - - - - - password - - - Password - - - Most IRC servers do not require a password - - - - - textLabel6 - - - Por&t: - - - port - - - - - port - - - 65536 - - - 1 - - - 6667 - - - - - textLabel4 - - - &Password: - - - password - - - - - textLabel5 - - - &Host: - - - host - - - - - host - - - true - - - - - - - - useSSL - - - Use SS&L - - - Check this to enable SSL for this connection - - - - - removeHost - - - - 1 - 0 - 0 - 0 - - - - &Remove - - - - - newHost - - - - 1 - 0 - 0 - 0 - - - - &New... - - - - - spacer3 - - - Horizontal - - - Expanding - - - - 210 - 20 - - - - - - downButton - - - false - - - Down - - - Move this server down - - - Move this server down in connection attempt priority - - - - - spacer4 - - - Vertical - - - Expanding - - - - 20 - 151 - - - - - - upButton - - - false - - - Up - - - Move this server up - - - Move this server up in connection attempt priority - - - - - - - cancelButton - - - &Cancel - - - - - saveButton - - - &Save - - - - - newNetwork - - - Ne&w - - - - - networkList - - - - 3 - 7 - 0 - 0 - - - - - - spacer5 - - - Horizontal - - - Expanding - - - - 260 - 20 - - - - - - renameNetwork - - - Rena&me... - - - - - removeNetwork - - - Remo&ve - - - - - - - cancelButton - clicked() - NetworkConfig - reject() - - - saveButton - clicked() - NetworkConfig - accept() - - - - networkList - newNetwork - renameNetwork - removeNetwork - description - hostList - upButton - downButton - host - port - password - useSSL - newHost - removeHost - saveButton - cancelButton - - - accepted() - rejected() - - - accept() - reject() - - - diff --git a/kopete/protocols/irc/ui/networtdeconfig.ui.h b/kopete/protocols/irc/ui/networtdeconfig.ui.h deleted file mode 100644 index 183ba57f..00000000 --- a/kopete/protocols/irc/ui/networtdeconfig.ui.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** -** ui.h extension file, included from the uic-generated form implementation. -** -** If you wish to add, delete or rename functions or slots use -** TQt Designer which will update this file, preserving your code. Create an -** init() function in place of a constructor, and a destroy() function in -** place of a destructor. -*****************************************************************************/ - - - - - - -void NetworkConfig::accept() -{ - emit accepted(); - TQDialog::accept(); -} - - -void NetworkConfig::reject() -{ - emit rejected(); - TQDialog::reject(); -} -- cgit v1.2.1