Hello community, here is the log from the commit of package krdc for openSUSE:Factory checked in at 2016-08-29 14:43:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krdc (Old) and /work/SRC/openSUSE:Factory/.krdc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krdc" Changes: -------- --- /work/SRC/openSUSE:Factory/krdc/krdc.changes 2016-07-21 07:47:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krdc.new/krdc.changes 2016-08-29 14:43:57.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:23:08 UTC 2016 - [email protected] + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:20:18 UTC 2016 - [email protected] + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- krdc-16.04.3.tar.xz New: ---- krdc-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krdc.spec ++++++ --- /var/tmp/diff_new_pack.p9OkzF/_old 2016-08-29 14:43:58.000000000 +0200 +++ /var/tmp/diff_new_pack.p9OkzF/_new 2016-08-29 14:43:58.000000000 +0200 @@ -36,7 +36,7 @@ BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5DocTools) BuildRequires: oxygen5-icon-theme-large -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Remote Desktop Connection License: GPL-2.0+ ++++++ krdc-16.04.3.tar.xz -> krdc-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krdc-16.04.3/CMakeLists.txt new/krdc-16.08.0/CMakeLists.txt --- old/krdc-16.04.3/CMakeLists.txt 2016-07-02 18:10:29.000000000 +0200 +++ new/krdc-16.08.0/CMakeLists.txt 2016-08-10 01:23:35.000000000 +0200 @@ -2,8 +2,8 @@ project(krdc) set (KDE_APPLICATIONS_VERSION_MAJOR "16") -set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "3") +set (KDE_APPLICATIONS_VERSION_MINOR "08") +set (KDE_APPLICATIONS_VERSION_MICRO "0") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krdc-16.04.3/config/general.ui new/krdc-16.08.0/config/general.ui --- old/krdc-16.04.3/config/general.ui 2016-07-02 18:10:29.000000000 +0200 +++ new/krdc-16.08.0/config/general.ui 2016-08-10 01:23:35.000000000 +0200 @@ -120,6 +120,24 @@ </property> </widget> </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayoutP"> + <item> + <widget class="QLabel" name="defaultProtocolLabel"> + <property name="text"> + <string>Default protocol:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="kcfg_DefaultProtocol"> + <property name="text"> + <string>vnc</string> + </property> + </widget> + </item> + </layout> + </item> </layout> </widget> </item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krdc-16.04.3/core/krdc.kcfg new/krdc-16.08.0/core/krdc.kcfg --- old/krdc-16.04.3/core/krdc.kcfg 2016-07-02 18:10:29.000000000 +0200 +++ new/krdc-16.08.0/core/krdc.kcfg 2016-08-10 01:23:35.000000000 +0200 @@ -60,6 +60,9 @@ <entry name="ConnectionListSortOrder" type="Int"> <default>1</default> </entry> + <entry name="DefaultProtocol" type="String"> + <default>vnc</default> + </entry> </group> <group name="VNC"> <entry name="Quality" type="Int"> @@ -86,7 +89,7 @@ <default>7</default> </entry> <entry name="Resolution" type="Int"> - <default>2</default> + <default>6</default> </entry> <entry name="ColorDepth" type="Int"> <default>2</default> Files old/krdc-16.04.3/doc/address_input.png and new/krdc-16.08.0/doc/address_input.png differ Files old/krdc-16.04.3/doc/bookmarks_menu.png and new/krdc-16.08.0/doc/bookmarks_menu.png differ Files old/krdc-16.04.3/doc/general_preferences.png and new/krdc-16.08.0/doc/general_preferences.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krdc-16.04.3/doc/index.docbook new/krdc-16.08.0/doc/index.docbook --- old/krdc-16.04.3/doc/index.docbook 2016-07-02 18:10:29.000000000 +0200 +++ new/krdc-16.08.0/doc/index.docbook 2016-08-10 01:23:35.000000000 +0200 @@ -1,7 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&krdc;"> - <!ENTITY package "kdenetwork"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> <!-- ONLY If you are writing non-English original documentation, change @@ -37,8 +35,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-06-19</date> -<releaseinfo>&kde; 4.11</releaseinfo> +<date>2016-07-25</date> +<releaseinfo>Applications 16.08</releaseinfo> <copyright> <year>2003, 2008</year> @@ -565,33 +563,6 @@ </chapter> -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-krdc"> -<title>How to obtain &krdc;</title> - -<!-- This first entity contains boiler plate for applications that are -part of K D E CVS. You should remove it if you are releasing your -application --> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and Installation</title> - -<!-- This entity contains the boilerplate text for standard --> -<!-- compilation instructions. If your application requires any --> -<!-- special handling, remove it, and replace with your own text. --> - -&install.compile.documentation; - -</sect1> - -</appendix> - &documentation.index; </book> Files old/krdc-16.04.3/doc/krdc_mainwindow.png and new/krdc-16.08.0/doc/krdc_mainwindow.png differ Files old/krdc-16.04.3/doc/password_entry.png and new/krdc-16.08.0/doc/password_entry.png differ Files old/krdc-16.04.3/doc/rdp_preferences.png and new/krdc-16.08.0/doc/rdp_preferences.png differ Files old/krdc-16.04.3/doc/view-fullscreen.png and new/krdc-16.08.0/doc/view-fullscreen.png differ Files old/krdc-16.04.3/doc/view-restore.png and new/krdc-16.08.0/doc/view-restore.png differ Files old/krdc-16.04.3/doc/vnc_host_configuration.png and new/krdc-16.08.0/doc/vnc_host_configuration.png differ Files old/krdc-16.04.3/doc/vnc_preferences.png and new/krdc-16.08.0/doc/vnc_preferences.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krdc-16.04.3/main.cpp new/krdc-16.08.0/main.cpp --- old/krdc-16.04.3/main.cpp 2016-07-02 18:10:29.000000000 +0200 +++ new/krdc-16.08.0/main.cpp 2016-08-10 01:23:35.000000000 +0200 @@ -25,6 +25,7 @@ #include "mainwindow.h" #include "krdc_debug.h" #include "krdc_version.h" +#include "settings.h" #include <KCoreAddons/KAboutData> #include <Kdelibs4ConfigMigrator> @@ -40,6 +41,7 @@ int main(int argc, char **argv) { + KLocalizedString::setApplicationDomain("krdc"); const QString appName = QStringLiteral("krdc"); QApplication app(argc, argv); QTime startupTimer; @@ -118,21 +120,13 @@ const QStringList args = parser.positionalArguments(); if (args.length() > 0) { for (int i = 0; i < args.length(); ++i) { - QUrl url = QUrl::fromLocalFile(args.at(i)); - if (url.scheme().isEmpty() || url.host().isEmpty()) { // unusable url; try to recover it... - QString arg = args.at(i); - - qCDebug(KRDC) << "unusable url; try to recover it:" << arg; - - if (arg.lastIndexOf(QLatin1Char('/')) != 0) - arg = arg.right(arg.length() - arg.lastIndexOf(QLatin1Char('/')) - 1); - - if (!arg.contains(QStringLiteral("://"))) - arg.prepend(QStringLiteral("vnc://")); // vnc was default in kde3 times... - - qCDebug(KRDC) << "recovered url:" << arg; - - url = QUrl(arg); + QUrl url = QUrl(args.at(i)); + // no URL scheme, assume argument is only a hostname + if (url.scheme().isEmpty()) { + QString defaultProto = Settings::defaultProtocol(); + url.setScheme(defaultProto); + url.setHost(args.at(i)); + url.setPath(QString()); } if (!url.isValid()) { continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krdc-16.04.3/mainwindow.cpp new/krdc-16.08.0/mainwindow.cpp --- old/krdc-16.04.3/mainwindow.cpp 2016-07-02 18:10:29.000000000 +0200 +++ new/krdc-16.08.0/mainwindow.cpp 2016-08-10 01:23:35.000000000 +0200 @@ -299,10 +299,7 @@ // Configure the view HostPreferences* prefs = view->hostPreferences(); - if (! prefs->showDialogIfNeeded(this)) { - delete view; - return; - } + prefs->showDialogIfNeeded(this); view->showDotCursor(prefs->showLocalCursor() ? RemoteView::CursorOn : RemoteView::CursorOff); view->setViewOnly(prefs->viewOnly()); @@ -989,7 +986,6 @@ { foreach (RemoteView *view, m_remoteViewMap.values()) { saveHostPrefs(view); - view->startQuitting(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krdc-16.04.3/rdp/rdpview.cpp new/krdc-16.08.0/rdp/rdpview.cpp --- old/krdc-16.04.3/rdp/rdpview.cpp 2016-07-02 18:10:29.000000000 +0200 +++ new/krdc-16.08.0/rdp/rdpview.cpp 2016-08-10 01:23:35.000000000 +0200 @@ -400,15 +400,25 @@ void RdpView::connectionClosed() { + connectionClosed(NormalClose); +} + +void RdpView::connectionClosed(CloseType closeType) +{ + if (m_quitFlag && closeType != ForceClose) { + return; + } emit disconnected(); setStatus(Disconnected); m_quitFlag = true; } -void RdpView::connectionError() +void RdpView::connectionError(const QString &text, const QString &caption) { + m_quitFlag = true; + KMessageBox::error(0, text, caption); emit disconnectedError(); - connectionClosed(); + connectionClosed(ForceClose); } void RdpView::processError(QProcess::ProcessError error) @@ -419,9 +429,8 @@ if (m_status == Connecting) { if (error == QProcess::FailedToStart) { - KMessageBox::error(0, i18n("Could not start \"xfreerdp\"; make sure xfreerdp is properly installed."), - i18n("RDP Failure")); - connectionError(); + connectionError(i18n("Could not start \"xfreerdp\"; make sure xfreerdp is properly installed."), + i18n("RDP Failure")); return; } } @@ -443,10 +452,9 @@ // Serial number of failed request: 36 // Current serial number in output stream: 36" if (line.contains(QLatin1String("X_ReparentWindow"))) { - KMessageBox::error(0, i18n("The version of \"xfreerdp\" you are using is too old.\n" + connectionError(i18n("The version of \"xfreerdp\" you are using is too old.\n" "xfreerdp 1.0.2 or greater is required."), - i18n("RDP Failure")); - connectionError(); + i18n("RDP Failure")); return; } else if(line.contains(QLatin1String("connection failure"))) { KMessageBox::error(0, i18n("Connection failed. You might have passed a wrong address or username."), @@ -465,31 +473,27 @@ Q_FOREACH (const QString &line, splittedOutput) { // full xfreerdp message: "transport_connect: getaddrinfo (Name or service not known)" if (line.contains(QLatin1String("Name or service not known"))) { - KMessageBox::error(0, i18n("Name or service not known."), - i18n("Connection Failure")); - connectionError(); + connectionError(i18n("Name or service not known."), + i18n("Connection Failure")); return; // full xfreerdp message: "unable to connect to example.com:3389" } else if (line.contains(QLatin1String("unable to connect to"))) { - KMessageBox::error(0, i18n("Connection attempt to host failed."), - i18n("Connection Failure")); - connectionError(); + connectionError(i18n("Connection attempt to host failed."), + i18n("Connection Failure")); return; } else if (line.contains(QLatin1String("Authentication failure, check credentials"))) { - KMessageBox::error(0, i18n("Authentication failure, check credentials."), - i18n("Connection Failure")); - connectionError(); + connectionError(i18n("Authentication failure, check credentials."), + i18n("Connection Failure")); return; // looks like some generic xfreerdp error message, handle it if nothing was handled: // "Error: protocol security negotiation failure" } else if (line.contains(QLatin1String("Error: protocol security negotiation failure")) || // xfreerdp 1.0 line.contains(QLatin1String("Error: protocol security negotiation or connection failure"))) { // xfreerdp 1.2 - KMessageBox::error(0, i18n("Connection attempt to host failed. Security negotiation or connection failure."), - i18n("Connection Failure")); - connectionError(); + connectionError(i18n("Connection attempt to host failed. Security negotiation or connection failure."), + i18n("Connection Failure")); return; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krdc-16.04.3/rdp/rdpview.h new/krdc-16.08.0/rdp/rdpview.h --- old/krdc-16.04.3/rdp/rdpview.h 2016-07-02 18:10:29.000000000 +0200 +++ new/krdc-16.08.0/rdp/rdpview.h 2016-08-10 01:23:35.000000000 +0200 @@ -72,6 +72,16 @@ bool eventFilter(QObject *obj, QEvent *event); private: + // Marks if connectionClosed should close the connection if m_quitFlag is true. + enum CloseType { + NormalClose, + ForceClose, + }; + + void connectionError(const QString &text, + const QString &caption); // called if xfreerdp quits with error + void connectionClosed(CloseType closeType); // Signals the connection closed if not quiting or it is forced + QString keymapToXfreerdp(const QString &keyboadLayout); QHash<QString, QString> initKeymapToXfreerdp(); @@ -89,7 +99,6 @@ private Q_SLOTS: void connectionOpened(); // called if xfreerdp started void connectionClosed(); // called if xfreerdp quits - void connectionError(); // called if xfreerdp quits with error void processError(QProcess::ProcessError error); // called if xfreerdp dies void receivedStandardError(); // catches xfreerdp debug output void receivedStandardOutput(); // catches xfreerdp output
