Commit ae1d4cde authored by Lukáš Tinkl's avatar Lukáš Tinkl
Browse files

porting++

parent 6d65abf9
......@@ -36,7 +36,6 @@
#include <KActionCollection>
#include <KLocale>
#include <KGlobal>
#include <KIcon>
#include <KLocalizedString>
#include <KMessageBox>
......@@ -68,6 +67,8 @@ ConnectionEditor::ConnectionEditor(QWidget* parent, Qt::WindowFlags flags)
m_editor->setupUi(tmp);
setCentralWidget(tmp);
setWindowTitle(i18n("Connection editor")); // TODO this shouldn't be necessary
m_editor->connectionsWidget->setSortingEnabled(false);
m_editor->connectionsWidget->sortByColumn(0, Qt::AscendingOrder);
m_editor->connectionsWidget->setSortingEnabled(true);
......
<?xml version="1.0" encoding="UTF-8"?>
<gui name="kde-nm-connection-editor"
version="3"
version="4"
xmlns="http://www.kde.org/standards/kxmlgui/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0
......@@ -8,6 +8,7 @@
<MenuBar>
<Menu name="file" >
<text>File</text>
<Action name="import_vpn" />
<Action name="export_vpn" />
</Menu>
......
......@@ -491,7 +491,7 @@ void OpenconnectAuthWidget::validatePeerCert(const QString &fingerprint,
QHBoxLayout *horizontalLayout;
QLabel *icon;
QLabel *infoText;
KTextBrowser *certificate;
QTextBrowser *certificate;
verticalLayout = new QVBoxLayout(widget);
horizontalLayout = new QHBoxLayout(widget);
......@@ -513,7 +513,7 @@ void OpenconnectAuthWidget::validatePeerCert(const QString &fingerprint,
verticalLayout->addLayout(horizontalLayout);
certificate = new KTextBrowser(widget);
certificate = new QTextBrowser(widget);
certificate->setTextInteractionFlags(Qt::TextSelectableByMouse);
certificate->setOpenLinks(false);
......
......@@ -153,7 +153,7 @@
</layout>
</item>
<item>
<widget class="KTextBrowser" name="serverLog">
<widget class="QTextBrowser" name="serverLog">
<property name="enabled">
<bool>true</bool>
</property>
......@@ -180,11 +180,6 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KTextBrowser</class>
<extends>QTextBrowser</extends>
<header>ktextbrowser.h</header>
</customwidget>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment