diff options
| -rw-r--r-- | knetattach/knetattach.ui | 63 | ||||
| -rw-r--r-- | knetattach/knetattach.ui.h | 13 |
2 files changed, 47 insertions, 29 deletions
diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui index f73f25707..0fe4c0823 100644 --- a/knetattach/knetattach.ui +++ b/knetattach/knetattach.ui @@ -51,14 +51,6 @@ <property name="margin"> <number>0</number> </property> - <widget class="TQRadioButton" row="4" column="0"> - <property name="name"> - <cstring>_recent</cstring> - </property> - <property name="text"> - <string>&Recent connection:</string> - </property> - </widget> <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>_webfolder</cstring> @@ -70,18 +62,53 @@ <bool>true</bool> </property> </widget> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>_ftp</cstring> + </property> + <property name="text"> + <string>FT&P</string> + </property> + </widget> + <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>_smb</cstring> + </property> + <property name="text"> + <string>&Microsoft® Windows® network drive</string> + </property> + </widget> <widget class="TQRadioButton" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> + <cstring>_sftp</cstring> + </property> + <property name="text"> + <string>&Secure shell (via SFTP)</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + <widget class="TQRadioButton" row="4" column="0" rowspan="1" colspan="2"> + <property name="name"> <cstring>_fish</cstring> </property> <property name="text"> - <string>&Secure shell (ssh)</string> + <string>&Secure shell (via FISH)</string> </property> <property name="checked"> <bool>false</bool> </property> </widget> - <widget class="KComboBox" row="4" column="1"> + <widget class="TQRadioButton" row="5" column="0"> + <property name="name"> + <cstring>_recent</cstring> + </property> + <property name="text"> + <string>&Recent connection:</string> + </property> + </widget> + <widget class="KComboBox" row="5" column="1"> <property name="name"> <cstring>_recentConnectionName</cstring> </property> @@ -103,22 +130,6 @@ </size> </property> </widget> - <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>_ftp</cstring> - </property> - <property name="text"> - <string>FT&P</string> - </property> - </widget> - <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>_smb</cstring> - </property> - <property name="text"> - <string>&Microsoft® Windows® network drive</string> - </property> - </widget> </grid> </widget> <spacer row="3" column="0"> diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h index 1df766960..7ac898dec 100644 --- a/knetattach/knetattach.ui.h +++ b/knetattach/knetattach.ui.h @@ -38,7 +38,7 @@ void KNetAttach::setInformationText( const TQString &type ) if (type=="WebFolder") { text = i18n("Enter a name for this <i>WebFolder</i> as well as a server address, port and folder path to use and press the <b>Save & Connect</b> button."); - } else if (type=="Fish") { + } else if (type=="Fish"||type=="SFTP") { text = i18n("Enter a name for this <i>Secure shell connection</i> as well as a server address, port and folder path to use and press the <b>Save & Connect</b> button."); } else if (type=="FTP") { text = i18n("Enter a name for this <i>File Transfer Protocol connection</i> as well as a server address and folder path to use and press the <b>Save & Connect</b> button."); @@ -64,6 +64,10 @@ void KNetAttach::showPage( TQWidget *page ) setInformationText("Fish"); updateForProtocol("Fish"); _port->setValue(22); + } else if (_sftp->isChecked()) { + setInformationText("SFTP"); + updateForProtocol("SFTP"); + _port->setValue(22); } else if (_ftp->isChecked()) { setInformationText("FTP"); updateForProtocol("FTP"); @@ -139,6 +143,9 @@ void KNetAttach::finished() } else if (_type == "Fish") { url.setProtocol("fish"); url.setPort(_port->value()); + } else if (_type == "SFTP") { + url.setProtocol("sftp"); + url.setPort(_port->value()); } else if (_type == "FTP") { url.setProtocol("ftp"); url.setPort(_port->value()); @@ -207,7 +214,7 @@ void KNetAttach::finished() } recent.setGroup(name); recent.writeEntry("URL", url.prettyURL()); - if (_type == "WebFolder" || _type == "Fish" || _type == "FTP") { + if (_type == "WebFolder" || _type == "Fish" || _type == "SFTP" || _type == "FTP") { recent.writeEntry("Port", _port->value()); } recent.writeEntry("Type", _type); @@ -250,7 +257,7 @@ bool KNetAttach::updateForProtocol(const TQString& protocol) _port->show(); _userText->show(); _user->show(); - } else if (protocol == "Fish") { + } else if (protocol == "Fish" || protocol == "SFTP") { _useEncryption->hide(); _portText->show(); _port->show(); |