summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvpnc.cpp66
-rw-r--r--src/kvpnc.h66
-rw-r--r--src/kvpncimportprofileselectiondialogbase.ui2
-rw-r--r--src/kvpnckicker.cpp4
-rw-r--r--src/kvpnckicker.h2
-rw-r--r--src/newprofilewizardnetworkroute.ui2
-rw-r--r--src/preferencesdialog.cpp2
-rw-r--r--src/profilenetworkrouteoptionsbase.ui2
-rw-r--r--src/toolsinfowidgetbase.ui2
9 files changed, 74 insertions, 74 deletions
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index eaa2529..0138598 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -111,7 +111,7 @@
//END includes
-KVpnc::KVpnc ( TDEApplication *parent, TQWidget*, const char *name ) : KMainWindow ( 0, name ), DCOPObject ( "KVpncInterface" )
+KVpnc::KVpnc ( TDEApplication *parent, TQWidget*, const char *name ) : TDEMainWindow ( 0, name ), DCOPObject ( "KVpncInterface" )
{
this->parent = parent;
setCaption ( i18n ( "KVpnc" ) );
@@ -364,38 +364,38 @@ void KVpnc::initAction()
( void* ) KStdAction::quit ( this, TQT_SLOT ( quitCalled() ), actionCollection() );
- SaveSessionAction = new KAction ( i18n ( "&Save Profile..." ), "fileexport", Key_S, this, TQT_SLOT ( saveSessionClicked() ), actionCollection(), "saveSession" );
- DeleteSessionAction = new KAction ( i18n ( "&Delete Profile..." ), "editdelete", Key_D, this, TQT_SLOT ( deleteSessionClicked() ), actionCollection(), "deleteSession" );
- RenameSessionAction = new KAction ( i18n ( "&Rename Profile..." ), "view_detailed", Key_D, this, TQT_SLOT ( renameSessionClicked() ), actionCollection(), "renameSession" );
- // NewSessionAction = new KAction( i18n( "&New Profile..." ), "profilenew", Key_N, this, TQT_SLOT( newSessionClicked() ), actionCollection(), "newSession" );
- //AdvancedSessionAction = new KAction( i18n( "&Advanced..." ), "wizard", Key_A, this, TQT_SLOT( advancedSettingsClicked() ), actionCollection(), "advancedSettingsSession" );
- ImportSessionAction = new KAction ( i18n ( "&Import Cisco pcf file..." ), "cisco", Key_F, this, TQT_SLOT ( importProfileClicked() ), actionCollection(), "importSession" );
- ImportOpenvpnProfileAction = new KAction ( i18n ( "Import &OpenVPN config file..." ), "openvpnimport", Key_O, this, TQT_SLOT ( importOpenvpnProfileClicked() ), actionCollection(), "importOpenvpnConfig" );
- ImportFreeswanProfileAction = new KAction ( i18n ( "Import &Freeswan/Openswan/strongSwan config file..." ), "openswan", Key_I, this, TQT_SLOT ( importIpsecProfileClicked() ), actionCollection(), "importFreeswanConfig" );
- ImportFritzboxProfileAction = new KAction ( i18n ( "Import Fritz&box VPN user config file..." ), "fritzboximport", Key_I, this, TQT_SLOT ( importFritzboxProfileClicked() ), actionCollection(), "importFritzboxConfig" );
- ImportCertAction = new KAction ( i18n ( "Import &certificate..." ), "certimport", Key_C, this, TQT_SLOT ( importCertClicked() ), actionCollection(), "importCert" );
- ManageCiscoCertAction = new KAction ( i18n ( "Manage Cisco certificates..." ), "certimport", Key_C, this, TQT_SLOT ( manageCiscoCertClicked() ), actionCollection(), "manageCiscoCert" );
- CiscoCertEnrollmentAction = new KAction ( i18n ( "Enroll Cisco certificates..." ), "certimport", Key_T, this, TQT_SLOT ( enrollCiscoCertClicked() ), actionCollection(), "enrollCiscoCert" );
- ExportOpenvpnProfileAction = new KAction ( i18n ( "Export &OpenVPN profile to config file" ), "openvpnexport", Key_O, this, TQT_SLOT ( exportOpenvpnProfileClicked() ), actionCollection(), "exportOpenvpnConfig" );
-
- ImportKvpncSettingsAction = new KAction ( i18n ( "Import KVpnc settings..." ), "2downarrow", Key_I, this, TQT_SLOT ( importKvpncSettingsClicked() ), actionCollection(), "importKvpncSettings" );
- ExportKvpncSettingsAction = new KAction ( i18n ( "Export KVpnc settings to file" ), "2uparrow", Key_E, this, TQT_SLOT ( exportKvpncSettingsClicked() ), actionCollection(), "exportKvpncSettings" );
-
- ConnectAction = new KAction ( i18n ( "&Connect" ), "connected", CTRL + Key_Up, this, TQT_SLOT ( slotConnecting() ), actionCollection(), "serverConnect" );
- DisconnectAction = new KAction ( i18n ( "&Disconnect" ), "disconnected", CTRL + Key_Down, this, TQT_SLOT ( disconnectClicked() ), actionCollection(), "serverDisconnect" );
- ProfileManagerAction = new KAction ( i18n ( "&Manage Profiles" ), "view_detailed", CTRL + Key_M, this, TQT_SLOT ( showProfileManagerClicked() ), actionCollection(), "profileManager" );
- NewProfileWizardAction = new KAction ( i18n ( "&new Profile (Wizard)" ), "wizard", CTRL + Key_W, this, TQT_SLOT ( showNewProfileWizardClicked() ), actionCollection(), "NewProfileWizard" );
-// DonateAction = new KAction ( i18n ( "&Support KVpnc..." ), "donate", CTRL + Key_D, this, TQT_SLOT ( donateClicked() ), actionCollection(), "donate" );
- ReportBugAction = new KAction ( i18n ( "&Report a bug..." ), "bug", CTRL + Key_R, this, TQT_SLOT ( reportBugClicked() ), actionCollection(), "reportbug" );
- DebugconsoleAction = new KToggleAction ( i18n ( "Toggle Debug &Console" ), "text_center", CTRL + Key_C, this, TQT_SLOT ( toggleDebugConsole() ), actionCollection(), "debugconsole" );
- ToolsInfoAction = new KToggleAction ( i18n ( "Show &Tools Info" ), "info", CTRL + Key_I, this, TQT_SLOT ( toolsInfoClicked() ), actionCollection(), "toolsinfo" );
- VpnTypesInfoAction = new KToggleAction ( i18n ( "Show &VPN types Info" ), "info", CTRL + Key_T, this, TQT_SLOT ( vpnTypesInfoClicked() ), actionCollection(), "vpntypesinfo" );
+ SaveSessionAction = new TDEAction ( i18n ( "&Save Profile..." ), "fileexport", Key_S, this, TQT_SLOT ( saveSessionClicked() ), actionCollection(), "saveSession" );
+ DeleteSessionAction = new TDEAction ( i18n ( "&Delete Profile..." ), "editdelete", Key_D, this, TQT_SLOT ( deleteSessionClicked() ), actionCollection(), "deleteSession" );
+ RenameSessionAction = new TDEAction ( i18n ( "&Rename Profile..." ), "view_detailed", Key_D, this, TQT_SLOT ( renameSessionClicked() ), actionCollection(), "renameSession" );
+ // NewSessionAction = new TDEAction( i18n( "&New Profile..." ), "profilenew", Key_N, this, TQT_SLOT( newSessionClicked() ), actionCollection(), "newSession" );
+ //AdvancedSessionAction = new TDEAction( i18n( "&Advanced..." ), "wizard", Key_A, this, TQT_SLOT( advancedSettingsClicked() ), actionCollection(), "advancedSettingsSession" );
+ ImportSessionAction = new TDEAction ( i18n ( "&Import Cisco pcf file..." ), "cisco", Key_F, this, TQT_SLOT ( importProfileClicked() ), actionCollection(), "importSession" );
+ ImportOpenvpnProfileAction = new TDEAction ( i18n ( "Import &OpenVPN config file..." ), "openvpnimport", Key_O, this, TQT_SLOT ( importOpenvpnProfileClicked() ), actionCollection(), "importOpenvpnConfig" );
+ ImportFreeswanProfileAction = new TDEAction ( i18n ( "Import &Freeswan/Openswan/strongSwan config file..." ), "openswan", Key_I, this, TQT_SLOT ( importIpsecProfileClicked() ), actionCollection(), "importFreeswanConfig" );
+ ImportFritzboxProfileAction = new TDEAction ( i18n ( "Import Fritz&box VPN user config file..." ), "fritzboximport", Key_I, this, TQT_SLOT ( importFritzboxProfileClicked() ), actionCollection(), "importFritzboxConfig" );
+ ImportCertAction = new TDEAction ( i18n ( "Import &certificate..." ), "certimport", Key_C, this, TQT_SLOT ( importCertClicked() ), actionCollection(), "importCert" );
+ ManageCiscoCertAction = new TDEAction ( i18n ( "Manage Cisco certificates..." ), "certimport", Key_C, this, TQT_SLOT ( manageCiscoCertClicked() ), actionCollection(), "manageCiscoCert" );
+ CiscoCertEnrollmentAction = new TDEAction ( i18n ( "Enroll Cisco certificates..." ), "certimport", Key_T, this, TQT_SLOT ( enrollCiscoCertClicked() ), actionCollection(), "enrollCiscoCert" );
+ ExportOpenvpnProfileAction = new TDEAction ( i18n ( "Export &OpenVPN profile to config file" ), "openvpnexport", Key_O, this, TQT_SLOT ( exportOpenvpnProfileClicked() ), actionCollection(), "exportOpenvpnConfig" );
+
+ ImportKvpncSettingsAction = new TDEAction ( i18n ( "Import KVpnc settings..." ), "2downarrow", Key_I, this, TQT_SLOT ( importKvpncSettingsClicked() ), actionCollection(), "importKvpncSettings" );
+ ExportKvpncSettingsAction = new TDEAction ( i18n ( "Export KVpnc settings to file" ), "2uparrow", Key_E, this, TQT_SLOT ( exportKvpncSettingsClicked() ), actionCollection(), "exportKvpncSettings" );
+
+ ConnectAction = new TDEAction ( i18n ( "&Connect" ), "connected", CTRL + Key_Up, this, TQT_SLOT ( slotConnecting() ), actionCollection(), "serverConnect" );
+ DisconnectAction = new TDEAction ( i18n ( "&Disconnect" ), "disconnected", CTRL + Key_Down, this, TQT_SLOT ( disconnectClicked() ), actionCollection(), "serverDisconnect" );
+ ProfileManagerAction = new TDEAction ( i18n ( "&Manage Profiles" ), "view_detailed", CTRL + Key_M, this, TQT_SLOT ( showProfileManagerClicked() ), actionCollection(), "profileManager" );
+ NewProfileWizardAction = new TDEAction ( i18n ( "&new Profile (Wizard)" ), "wizard", CTRL + Key_W, this, TQT_SLOT ( showNewProfileWizardClicked() ), actionCollection(), "NewProfileWizard" );
+// DonateAction = new TDEAction ( i18n ( "&Support KVpnc..." ), "donate", CTRL + Key_D, this, TQT_SLOT ( donateClicked() ), actionCollection(), "donate" );
+ ReportBugAction = new TDEAction ( i18n ( "&Report a bug..." ), "bug", CTRL + Key_R, this, TQT_SLOT ( reportBugClicked() ), actionCollection(), "reportbug" );
+ DebugconsoleAction = new TDEToggleAction ( i18n ( "Toggle Debug &Console" ), "text_center", CTRL + Key_C, this, TQT_SLOT ( toggleDebugConsole() ), actionCollection(), "debugconsole" );
+ ToolsInfoAction = new TDEToggleAction ( i18n ( "Show &Tools Info" ), "info", CTRL + Key_I, this, TQT_SLOT ( toolsInfoClicked() ), actionCollection(), "toolsinfo" );
+ VpnTypesInfoAction = new TDEToggleAction ( i18n ( "Show &VPN types Info" ), "info", CTRL + Key_T, this, TQT_SLOT ( vpnTypesInfoClicked() ), actionCollection(), "vpntypesinfo" );
// // tmp
-// ToolsInfoAction = new KToggleAction ( i18n("Show &Tools Info"), "info", CTRL + Key_T, this, TQT_SLOT(helpClicked() ), actionCollection(), "toolsinfo" );
+// ToolsInfoAction = new TDEToggleAction ( i18n("Show &Tools Info"), "info", CTRL + Key_T, this, TQT_SLOT(helpClicked() ), actionCollection(), "toolsinfo" );
- LogViewerAction = new KToggleAction ( i18n ( "Show &Log" ), "log", CTRL + Key_L, this, TQT_SLOT ( showLogViewer() ), actionCollection(), "logviewer" );
- GenerateOpenvpnKeyAction = new KToggleAction ( i18n ( "Generate OpenVPN Key" ), "key", CTRL + Key_G, this, TQT_SLOT ( generateOpenvpnKey() ), actionCollection(), "genOpenvpncKey" );
- SendFeedbackMailAction = new KAction ( i18n ( "Send &Feedback Mail..." ), 0, this, TQT_SLOT ( sendFeedbackMail() ), actionCollection(), "help_send_feedback_mail" );
+ LogViewerAction = new TDEToggleAction ( i18n ( "Show &Log" ), "log", CTRL + Key_L, this, TQT_SLOT ( showLogViewer() ), actionCollection(), "logviewer" );
+ GenerateOpenvpnKeyAction = new TDEToggleAction ( i18n ( "Generate OpenVPN Key" ), "key", CTRL + Key_G, this, TQT_SLOT ( generateOpenvpnKey() ), actionCollection(), "genOpenvpncKey" );
+ SendFeedbackMailAction = new TDEAction ( i18n ( "Send &Feedback Mail..." ), 0, this, TQT_SLOT ( sendFeedbackMail() ), actionCollection(), "help_send_feedback_mail" );
PrefAction = KStdAction::preferences ( this, TQT_SLOT ( slotSettings() ), actionCollection(), "preferences" );
KStdAction::helpContents ( this, TQT_SLOT ( helpClicked () ), actionCollection(), "help" );
KStdAction::configureNotifications ( this, TQT_SLOT ( slotConfigNotifications() ), actionCollection() );
@@ -877,7 +877,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e )
TQFile file ( tmpPath + "kvpnc_running" );
file.remove();
- KMainWindow::closeEvent ( e );
+ TDEMainWindow::closeEvent ( e );
}
else
{
@@ -909,7 +909,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e )
GlobalConfig->saveOptions();
saveGuiOptions();
- //KMainWindow::closeEvent( e );
+ //TDEMainWindow::closeEvent( e );
disconnectClicked();
tmpPath = locateLocal ( "data", "kvpnc/" );
TQFile file ( tmpPath + "kvpnc_running" );
diff --git a/src/kvpnc.h b/src/kvpnc.h
index 7f20740..1a6a4d7 100644
--- a/src/kvpnc.h
+++ b/src/kvpnc.h
@@ -69,7 +69,7 @@
* main class of kvpnc
* @author Christoph Thielecke
*/
-class KVpnc : public KMainWindow , DCOPObject
+class KVpnc : public TDEMainWindow , DCOPObject
{
Q_OBJECT
@@ -150,38 +150,38 @@ private:
KVpncConfig *GlobalConfig;
KVpncKicker* KVpncDock; //< kicker menu
- KAction* ConnectAction; //< connect action
- KAction* DisconnectAction; //< disconnect action
- KAction *NewSessionAction;
- KAction *SaveSessionAction;
- KAction *DeleteSessionAction;
- KAction *RenameSessionAction;
- KAction *ImportSessionAction;
- KAction *ImportOpenvpnProfileAction;
- KAction *ExportOpenvpnProfileAction;
- KAction *ImportFreeswanProfileAction;
- KAction *ImportFritzboxProfileAction;
- KAction *ImportKvpncSettingsAction;
- KAction *ExportKvpncSettingsAction;
- KAction *ImportCertAction;
- KAction *SelectAction; //< line select action
- KAction *ProfileManagerAction;
- KAction *NewProfileWizardAction;
- KAction *HelpAction;
- KAction *PrefAction;
-// KAction *DonateAction;
- KAction *ReportBugAction;
- KAction *SendFeedbackMailAction;
- KAction *PreferencesAction; //< show preferences dialog
- KAction *ManageCiscoCertAction; //< show cisco cert manager
- KAction *CiscoCertEnrollmentAction; //< show cisco cert enrollment dialog
- KToggleAction *ToolsInfoAction;
- KToggleAction *VpnTypesInfoAction;
- KToggleAction *LogViewerAction;
- KToggleAction *ShowToolbarAction; //< toggle toolbar on/off
- KToggleAction *ShowStatusbarAction; //< toggle statusbar on/off
- KToggleAction *DebugconsoleAction; //< toggle debug console
- KToggleAction *GenerateOpenvpnKeyAction; //< generate OpenVPN key
+ TDEAction* ConnectAction; //< connect action
+ TDEAction* DisconnectAction; //< disconnect action
+ TDEAction *NewSessionAction;
+ TDEAction *SaveSessionAction;
+ TDEAction *DeleteSessionAction;
+ TDEAction *RenameSessionAction;
+ TDEAction *ImportSessionAction;
+ TDEAction *ImportOpenvpnProfileAction;
+ TDEAction *ExportOpenvpnProfileAction;
+ TDEAction *ImportFreeswanProfileAction;
+ TDEAction *ImportFritzboxProfileAction;
+ TDEAction *ImportKvpncSettingsAction;
+ TDEAction *ExportKvpncSettingsAction;
+ TDEAction *ImportCertAction;
+ TDEAction *SelectAction; //< line select action
+ TDEAction *ProfileManagerAction;
+ TDEAction *NewProfileWizardAction;
+ TDEAction *HelpAction;
+ TDEAction *PrefAction;
+// TDEAction *DonateAction;
+ TDEAction *ReportBugAction;
+ TDEAction *SendFeedbackMailAction;
+ TDEAction *PreferencesAction; //< show preferences dialog
+ TDEAction *ManageCiscoCertAction; //< show cisco cert manager
+ TDEAction *CiscoCertEnrollmentAction; //< show cisco cert enrollment dialog
+ TDEToggleAction *ToolsInfoAction;
+ TDEToggleAction *VpnTypesInfoAction;
+ TDEToggleAction *LogViewerAction;
+ TDEToggleAction *ShowToolbarAction; //< toggle toolbar on/off
+ TDEToggleAction *ShowStatusbarAction; //< toggle statusbar on/off
+ TDEToggleAction *DebugconsoleAction; //< toggle debug console
+ TDEToggleAction *GenerateOpenvpnKeyAction; //< generate OpenVPN key
MainView* mw; //< Main gui
TQTimer timer;
TQTimer durationTimer; //< timer for counting connection time
diff --git a/src/kvpncimportprofileselectiondialogbase.ui b/src/kvpncimportprofileselectiondialogbase.ui
index 2480904..29aa564 100644
--- a/src/kvpncimportprofileselectiondialogbase.ui
+++ b/src/kvpncimportprofileselectiondialogbase.ui
@@ -35,7 +35,7 @@
<string>Select profile for import:</string>
</property>
</widget>
- <widget class="KListView">
+ <widget class="TDEListView">
<property name="name">
<cstring>ImportProfileListView</cstring>
</property>
diff --git a/src/kvpnckicker.cpp b/src/kvpnckicker.cpp
index c957ddf..017c7c0 100644
--- a/src/kvpnckicker.cpp
+++ b/src/kvpnckicker.cpp
@@ -32,7 +32,7 @@ KVpncKicker::KVpncKicker( KVpncConfig *GlobalConfig,TQWidget* parent, const char
this->parent = parent;
this->initDockWindow();
this->GlobalConfig = GlobalConfig;
- KAction *quit = actionCollection()->action( "file_quit" );
+ TDEAction *quit = actionCollection()->action( "file_quit" );
quit->disconnect();
KVpnc *myParent = static_cast<KVpnc *>( parent );
connect( quit, TQT_SIGNAL( activated() ), myParent, TQT_SLOT( quitCalledKicker() ) );
@@ -79,6 +79,6 @@ void KVpncKicker::initDockWindow() {
TQToolTip::add(this, i18n("Disconnected"));
}
-KPopupMenu* KVpncKicker::menu() {
+TDEPopupMenu* KVpncKicker::menu() {
return contextMenu();
}
diff --git a/src/kvpnckicker.h b/src/kvpnckicker.h
index 763125e..5480150 100644
--- a/src/kvpnckicker.h
+++ b/src/kvpnckicker.h
@@ -34,7 +34,7 @@ class KVpncKicker : public KSystemTray {
public:
KVpncKicker( KVpncConfig *GlobalConfig,TQWidget*parent = 0, const char *name = 0 );
~KVpncKicker();
- KPopupMenu* menu();
+ TDEPopupMenu* menu();
enum status {disconnected=0, connecting=1, connected=2};
void setStatus( int status );
public slots:
diff --git a/src/newprofilewizardnetworkroute.ui b/src/newprofilewizardnetworkroute.ui
index c0fe482..3222e68 100644
--- a/src/newprofilewizardnetworkroute.ui
+++ b/src/newprofilewizardnetworkroute.ui
@@ -91,7 +91,7 @@
<string>Alt+U</string>
</property>
</widget>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Network</string>
diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp
index 5ff6fb0..7e19db1 100644
--- a/src/preferencesdialog.cpp
+++ b/src/preferencesdialog.cpp
@@ -6832,7 +6832,7 @@ void PreferencesDialog::showEvent(TQShowEvent* e)
KDialogBase::showEvent(e);
TQSplitter* splitter = ((TQSplitter*)child(0, TQSPLITTER_OBJECT_NAME_STRING, true));
- KListView* listView = ((KListView*)child(0, "KListView", true));
+ TDEListView* listView = ((TDEListView*)child(0, "TDEListView", true));
if (splitter && listView)
{
diff --git a/src/profilenetworkrouteoptionsbase.ui b/src/profilenetworkrouteoptionsbase.ui
index 3c43d97..708b44e 100644
--- a/src/profilenetworkrouteoptionsbase.ui
+++ b/src/profilenetworkrouteoptionsbase.ui
@@ -91,7 +91,7 @@
<string>Alt+U</string>
</property>
</widget>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Network</string>
diff --git a/src/toolsinfowidgetbase.ui b/src/toolsinfowidgetbase.ui
index 5acf0d7..706df13 100644
--- a/src/toolsinfowidgetbase.ui
+++ b/src/toolsinfowidgetbase.ui
@@ -27,7 +27,7 @@
<string>The following information about the tools has been collected:</string>
</property>
</widget>
- <widget class="KListView" row="1" column="0">
+ <widget class="TDEListView" row="1" column="0">
<column>
<property name="text">
<string>Tool</string>