Hello community,
here is the log from the commit of package kdenetwork4-filesharing for
openSUSE:Factory checked in at 2016-01-07 00:21:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdenetwork4-filesharing (Old)
and /work/SRC/openSUSE:Factory/.kdenetwork4-filesharing.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdenetwork4-filesharing"
Changes:
--------
---
/work/SRC/openSUSE:Factory/kdenetwork4-filesharing/kdenetwork4-filesharing.changes
2015-11-15 12:33:47.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.kdenetwork4-filesharing.new/kdenetwork4-filesharing.changes
2016-01-07 00:21:06.000000000 +0100
@@ -1,0 +2,9 @@
+Sun Dec 13 13:15:44 UTC 2015 - [email protected]
+
+- Update to KDE Applications 15.12.0
+ * KDE Applications 15.12.0
+ * https://www.kde.org/announcements/announce-applications-15.12.0.php
+ * boo#958887
+
+
+-------------------------------------------------------------------
Old:
----
kdenetwork-filesharing-15.08.3.tar.xz
New:
----
kdenetwork-filesharing-15.12.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdenetwork4-filesharing.spec ++++++
--- /var/tmp/diff_new_pack.Qq8LF2/_old 2016-01-07 00:21:08.000000000 +0100
+++ /var/tmp/diff_new_pack.Qq8LF2/_new 2016-01-07 00:21:08.000000000 +0100
@@ -17,8 +17,7 @@
Name: kdenetwork4-filesharing
-BuildRequires: libkde4-devel
-Version: 15.08.3
+Version: 15.12.0
Release: 0
Summary: KDE Network Libraries
License: GPL-2.0+
@@ -26,8 +25,16 @@
Url: http://www.kde.org
Source0: kdenetwork-filesharing-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: extra-cmake-modules
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: kdoctools-devel
+BuildRequires: kcoreaddons-devel
+BuildRequires: ki18n-devel
+BuildRequires: kio-devel
+BuildRequires: kwidgetsaddons-devel
+BuildRequires: PackageKit-Qt5-devel
Enhances: dolphin
-%kde4_runtime_requires
%description
Network File Sharing configuration module and plugin
@@ -40,12 +47,11 @@
%ifarch ppc ppc64
export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
- %cmake_kde4 -d build
+ %cmake_kf5 -d build
%make_jobs
%install
- %kde4_makeinstall -C build
- %kde_post_install
+ %kf5_makeinstall -C build
%post -p /sbin/ldconfig
@@ -54,7 +60,7 @@
%files
%defattr(-,root,root)
%doc COPYING COPYING.DOC
-%{_kde4_modulesdir}/sambausershareplugin.so
-%{_kde4_servicesdir}/sambausershareplugin.desktop
+%_kf5_plugindir/sambausershareplugin.so
+%_kf5_servicesdir/sambausershareplugin.desktop
%changelog
++++++ kdenetwork-filesharing-15.08.3.tar.xz ->
kdenetwork-filesharing-15.12.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdenetwork-filesharing-15.08.3/CMakeLists.txt
new/kdenetwork-filesharing-15.12.0/CMakeLists.txt
--- old/kdenetwork-filesharing-15.08.3/CMakeLists.txt 2014-07-25
07:40:03.000000000 +0200
+++ new/kdenetwork-filesharing-15.12.0/CMakeLists.txt 2015-10-16
12:30:25.000000000 +0200
@@ -1,45 +1,65 @@
+cmake_minimum_required(VERSION 2.8.9)
project(filesharing)
+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
-if(NOT INSIDE_KDENETWORK)
- message("Not building inside KDENetwork, loading KDE CMake Macros.")
-
- find_package(KDE4 REQUIRED)
-
- include(KDE4Defaults)
- include(MacroLibrary)
-
- include(CheckIncludeFile)
- include(CheckIncludeFiles)
- include(CheckSymbolExists)
- include(CheckFunctionExists)
- include(CheckLibraryExists)
- include(CheckPrototypeExists)
- include(CheckTypeSize)
-
- set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS})
- if(WIN32)
- set(CMAKE_REQUIRED_LIBRARIES ${KDEWIN32_LIBRARIES})
- set(CMAKE_REQUIRED_INCLUDES ${KDEWIN32_INCLUDES})
- endif(WIN32)
- add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS}
${KDE4_DEFINITIONS})
- add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
- include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
${KDE4_INCLUDES})
-endif(NOT INSIDE_KDENETWORK)
+set(QT_MIN_VERSION "5.0.0")
+set(KF5_MIN_VERSION "5.7.0")
+set(ECM_MIN_VERSION "1.6.0")
+
+find_package(ECM ${ECM_MIN_VERSION} CONFIG REQUIRED)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+
+include(FeatureSummary)
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDEFrameworkCompilerSettings)
+
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+ Core
+ Widgets
+)
+
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ DocTools
+ CoreAddons
+ I18n
+ KIO
+ WidgetsAddons
+)
+
+find_package(PackageKitQt5 0.9.5)
+set_package_properties(PackageKitQt5
+ PROPERTIES DESCRIPTION "Software Manager integration"
+ TYPE OPTIONAL
+ PURPOSE "Needed to automatically install the samba package."
+)
+
+include(CheckIncludeFile)
+include(CheckIncludeFiles)
+include(CheckSymbolExists)
+include(CheckFunctionExists)
+include(CheckLibraryExists)
+include(CheckTypeSize)
+
+if(WIN32)
+ set(CMAKE_REQUIRED_LIBRARIES ${KDEWIN32_LIBRARIES})
+ set(CMAKE_REQUIRED_INCLUDES ${KDEWIN32_INCLUDES})
+endif(WIN32)
option(SAMBA_INSTALL "Offer to install Samba for file sharing with PackageKit
if it is not already installed, use -DSAMBA_INSTALL=off to disable, use
-DSAMBA_PACKAGE_NAME= to set package name." ON)
-if(NOT SAMBA_PACKAGE_NAME)
- set(SAMBA_PACKAGE_NAME \\\"samba\\\")
-endif(NOT SAMBA_PACKAGE_NAME)
-if(SAMBA_INSTALL)
- message(STATUS "Samba install feature will be enabled.")
+set(SAMBA_PACKAGE_NAME \"samba\" CACHE STRING "Name of distribution package to
install to get a functional samba stack.")
+
+if(SAMBA_INSTALL AND PackageKitQt5_FOUND)
add_definitions(-DSAMBA_INSTALL)
add_definitions(-DSAMBA_PACKAGE_NAME=${SAMBA_PACKAGE_NAME})
-else(SAMBA_INSTALL)
- message(STATUS "Samba install feature will NOT be enabled.")
-endif(SAMBA_INSTALL)
+else()
+ set(SAMBA_INSTALL false)
+endif()
+add_feature_info("Samba Installation" SAMBA_INSTALL "Automatic installation of
'${SAMBA_PACKAGE_NAME}' using PackageKit.")
+
+# KI18N Translation Domain for this library
+add_definitions(-DTRANSLATION_DOMAIN=\"kfileshare\")
add_subdirectory(samba)
-if(NOT INSIDE_KDENETWORK)
- macro_display_feature_log()
-endif(NOT INSIDE_KDENETWORK)
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES
FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdenetwork-filesharing-15.08.3/samba/filepropertiesplugin/CMakeLists.txt
new/kdenetwork-filesharing-15.12.0/samba/filepropertiesplugin/CMakeLists.txt
---
old/kdenetwork-filesharing-15.08.3/samba/filepropertiesplugin/CMakeLists.txt
2014-07-25 07:40:03.000000000 +0200
+++
new/kdenetwork-filesharing-15.12.0/samba/filepropertiesplugin/CMakeLists.txt
2015-10-16 12:30:25.000000000 +0200
@@ -2,12 +2,22 @@
set(sambausershareplugin_PART_SRCS sambausershareplugin.cpp delegate.cpp
model.cpp)
-kde4_add_ui_files(sambausershareplugin_PART_SRCS sambausershareplugin.ui)
+ki18n_wrap_ui(sambausershareplugin_PART_SRCS sambausershareplugin.ui)
+add_library(sambausershareplugin MODULE ${sambausershareplugin_PART_SRCS})
-kde4_add_plugin(sambausershareplugin ${sambausershareplugin_PART_SRCS})
+target_link_libraries(sambausershareplugin
+ KF5::CoreAddons
+ KF5::I18n
+ KF5::KIOWidgets
+ KF5::WidgetsAddons
+)
+
+if(SAMBA_INSTALL)
+ target_link_libraries(sambausershareplugin PK::packagekitqt5)
+endif()
-target_link_libraries(sambausershareplugin ${KDE4_KIO_LIBS})
+target_include_directories(sambausershareplugin PUBLIC ${Qt5DBus_INCLUDE_DIRS})
install(TARGETS sambausershareplugin DESTINATION ${PLUGIN_INSTALL_DIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdenetwork-filesharing-15.08.3/samba/filepropertiesplugin/delegate.cpp
new/kdenetwork-filesharing-15.12.0/samba/filepropertiesplugin/delegate.cpp
--- old/kdenetwork-filesharing-15.08.3/samba/filepropertiesplugin/delegate.cpp
2014-07-25 07:40:03.000000000 +0200
+++ new/kdenetwork-filesharing-15.12.0/samba/filepropertiesplugin/delegate.cpp
2015-10-16 12:30:25.000000000 +0200
@@ -19,7 +19,7 @@
*/
#include <QComboBox>
-#include <klocale.h>
+#include <KLocalizedString>
#include "delegate.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdenetwork-filesharing-15.08.3/samba/filepropertiesplugin/delegate.h
new/kdenetwork-filesharing-15.12.0/samba/filepropertiesplugin/delegate.h
--- old/kdenetwork-filesharing-15.08.3/samba/filepropertiesplugin/delegate.h
2014-07-25 07:40:03.000000000 +0200
+++ new/kdenetwork-filesharing-15.12.0/samba/filepropertiesplugin/delegate.h
2015-10-16 12:30:25.000000000 +0200
@@ -36,8 +36,7 @@
void setEditorData(QWidget *editor, const QModelIndex &index) const;
void setModelData(QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index) const;
-
-private slots:
+private Q_SLOTS:
void emitCommitData();
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdenetwork-filesharing-15.08.3/samba/filepropertiesplugin/model.cpp
new/kdenetwork-filesharing-15.12.0/samba/filepropertiesplugin/model.cpp
--- old/kdenetwork-filesharing-15.08.3/samba/filepropertiesplugin/model.cpp
2014-07-25 07:40:03.000000000 +0200
+++ new/kdenetwork-filesharing-15.12.0/samba/filepropertiesplugin/model.cpp
2015-10-16 12:30:25.000000000 +0200
@@ -35,15 +35,17 @@
void UserPermissionModel::setupData()
{
- QStringList acl = shareData.acl().split(",", QString::SkipEmptyParts);
+ QStringList acl = shareData.acl().split(QStringLiteral(","),
+ QString::SkipEmptyParts);
QList<QString>::const_iterator itr;
for (itr = acl.constBegin(); itr != acl.constEnd(); ++itr) {
- QStringList userInfo = (*itr).trimmed().split(":");
+ QStringList userInfo = (*itr).trimmed().split(QStringLiteral(":"));
usersAcl.insert(userInfo.at(0), QVariant(userInfo.at(1)));
}
if (usersAcl.isEmpty()) {
- usersAcl.insert("Everyone", QVariant("R"));
+ usersAcl.insert(QStringLiteral("Everyone"),
+ QVariant(QStringLiteral("R")));
}
}
@@ -76,13 +78,13 @@
#endif
QStringList userList;
- userList.append("Everyone");
+ userList.append(QStringLiteral("Everyone"));
foreach (const QString &username, KUser::allUserNames()) {
- if (username == "nobody") {
+ if (username == QStringLiteral("nobody")) {
continue;
}
KUser user(username);
- if (user.uid() >= defminuid) {
+ if (user.userId().nativeId() >= defminuid) {
userList << username;
}
}
@@ -92,11 +94,13 @@
int UserPermissionModel::rowCount(const QModelIndex &parent) const
{
+ Q_UNUSED(parent);
return userList.count();
}
int UserPermissionModel::columnCount(const QModelIndex &parent) const
{
+ Q_UNUSED(parent);
return 2;
}
@@ -137,7 +141,7 @@
return false;
}
- QString key("");
+ QString key;
QMap<QString, QVariant>::ConstIterator itr;
for (itr = usersAcl.constBegin(); itr != usersAcl.constEnd(); ++itr) {
if (itr.key().endsWith(userList.at(index.row()))) {
@@ -162,14 +166,14 @@
QString UserPermissionModel::getAcl() const
{
- QString result("");
+ QString result;
QMap<QString, QVariant>::ConstIterator itr;
for (itr = usersAcl.constBegin(); itr != usersAcl.constEnd(); ++itr) {
if (!itr.value().toString().isEmpty()) {
- result.append(itr.key() + ":" + itr.value().toString().toLower());
+ result.append(itr.key() + QStringLiteral(":") +
itr.value().toString().toLower());
if (itr != (usersAcl.constEnd() - 1)) {
- result.append(",");
+ result.append(QStringLiteral(","));
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdenetwork-filesharing-15.08.3/samba/filepropertiesplugin/sambausershareplugin.cpp
new/kdenetwork-filesharing-15.12.0/samba/filepropertiesplugin/sambausershareplugin.cpp
---
old/kdenetwork-filesharing-15.08.3/samba/filepropertiesplugin/sambausershareplugin.cpp
2014-07-25 07:40:03.000000000 +0200
+++
new/kdenetwork-filesharing-15.12.0/samba/filepropertiesplugin/sambausershareplugin.cpp
2015-10-16 12:30:25.000000000 +0200
@@ -1,6 +1,7 @@
/*
Copyright (c) 2004 Jan Schaefer <[email protected]>
Copyright (c) 2011 Rodrigo Belem <[email protected]>
+ Copyright (c) 2015 Harald Sitter <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,21 +19,19 @@
*/
+#include <QDialogButtonBox>
#include <QFileInfo>
+#include <QFrame>
+#include <QPushButton>
+#include <QStandardPaths>
#include <QStringList>
-#include <QStandardItemModel>
-#include <QDBusInterface>
-#include <QDBusReply>
-
-#include <kvbox.h>
-#include <kuser.h>
-#include <kdebug.h>
-#include <kpushbutton.h>
-#include <ksambashare.h>
-#include <ksambasharedata.h>
-#include <kmessagebox.h>
-#include <KDE/KPluginFactory>
-#include <KDE/KPluginLoader>
+#include <QDebug>
+
+#include <KMessageBox>
+#include <KPluginFactory>
+#include <KPluginLoader>
+#include <KSambaShare>
+#include <KSambaShareData>
#include "sambausershareplugin.h"
#include "model.h"
@@ -43,53 +42,50 @@
SambaUserSharePlugin::SambaUserSharePlugin(QObject *parent, const
QList<QVariant> &args)
: KPropertiesDialogPlugin(qobject_cast<KPropertiesDialog *>(parent))
- , url()
+ , m_url(properties->url().toLocalFile())
, shareData()
{
- url = properties->kurl().path(KUrl::RemoveTrailingSlash);
- if (url.isEmpty()) {
+ Q_UNUSED(args);
+
+ if (m_url.isEmpty()) {
return;
}
- QFileInfo pathInfo(url);
+ QFileInfo pathInfo(m_url);
if (!pathInfo.permission(QFile::ReadUser | QFile::WriteUser)) {
return;
}
- KGlobal::locale()->insertCatalog("kfileshare");
-
- KVBox *vbox = new KVBox();
+ QFrame *vbox = new QFrame();
properties->addPage(vbox, i18n("&Share"));
properties->setFileSharingPage(vbox);
+ QVBoxLayout *vLayoutMaster = new QVBoxLayout(vbox);
- if (!QFile::exists("/usr/sbin/smbd")
- && !QFile::exists("/usr/local/sbin/smbd")) {
+ m_installSambaWidgets = new QWidget(vbox);
+ vLayoutMaster->addWidget(m_installSambaWidgets);
+ QVBoxLayout *vLayout = new QVBoxLayout(m_installSambaWidgets);
+ vLayout->setAlignment(Qt::AlignJustify);
+ vLayout->setMargin(0);
- QWidget *widget = new QWidget(vbox);
- QVBoxLayout *vLayout = new QVBoxLayout(widget);
- vLayout->setAlignment(Qt::AlignJustify);
- vLayout->setSpacing(KDialog::spacingHint());
- vLayout->setMargin(0);
-
- vLayout->addWidget(new QLabel(i18n("Samba is not installed on your
system."), widget));
+ vLayout->addWidget(new QLabel(i18n("Samba is not installed on your
system."), m_installSambaWidgets));
#ifdef SAMBA_INSTALL
- KPushButton *btn = new KPushButton(i18n("Install Samba..."), widget);
- btn->setDefault(false);
- vLayout->addWidget(btn);
- connect(btn, SIGNAL(clicked()), SLOT(installSamba()));
+ m_installSambaButton = new QPushButton(i18n("Install Samba..."),
m_installSambaWidgets);
+ m_installSambaButton->setDefault(false);
+ vLayout->addWidget(m_installSambaButton);
+ connect(m_installSambaButton, SIGNAL(clicked()), SLOT(installSamba()));
+ m_installProgress = new QProgressBar();
+ vLayout->addWidget(m_installProgress);
+ m_installProgress->hide();
#endif
- // align items on top
- vLayout->addStretch();
-
- return;
- }
-
- QWidget *widget = new QWidget(vbox);
- propertiesUi.setupUi(widget);
+ // align items on top
+ vLayout->addStretch();
+ m_shareWidgets = new QWidget(vbox);
+ vLayoutMaster->addWidget(m_shareWidgets);
+ propertiesUi.setupUi(m_shareWidgets);
- QList<KSambaShareData> shareList =
KSambaShare::instance()->getSharesByPath(url);
+ QList<KSambaShareData> shareList =
KSambaShare::instance()->getSharesByPath(m_url);
if (!shareList.isEmpty()) {
shareData = shareList.at(0); // FIXME: using just the first in the
list for a while
@@ -109,28 +105,52 @@
for (int i = 0; i < model->rowCount(); ++i) {
propertiesUi.tableView->openPersistentEditor(model->index(i, 1,
QModelIndex()));
}
+ if (QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty()) {
+ m_installSambaWidgets->show();
+ m_shareWidgets->hide();
+ } else {
+ m_installSambaWidgets->hide();
+ m_shareWidgets->show();
+ }
}
SambaUserSharePlugin::~SambaUserSharePlugin()
{
}
+#ifdef SAMBA_INSTALL
void SambaUserSharePlugin::installSamba()
{
- unsigned int xid = 0;
- QStringList packages;
- packages << SAMBA_PACKAGE_NAME;
- QString interaction("show-confirm-install,show-progress");
-
- QDBusInterface device("org.freedesktop.PackageKit",
"/org/freedesktop/PackageKit",
- "org.freedesktop.PackageKit.Modify");
- if (!device.isValid()) {
- KMessageBox::sorry(qobject_cast<KPropertiesDialog *>(this),
- i18n("<qt><strong>Samba could not be installed.</strong><br
/>Please, check if kpackagekit is properly installed</qt>"));
- return;
- }
- QDBusReply<int> reply = device.call("InstallPackageNames", xid, packages,
interaction);
+ QString package = QStringLiteral(SAMBA_PACKAGE_NAME);
+ PackageKit::Transaction *transaction = PackageKit::Daemon::resolve(package,
+
PackageKit::Transaction::FilterNone);
+ connect(transaction,
+ SIGNAL(package(PackageKit::Transaction::Info,QString,QString)),
+
SLOT(packageInstall(PackageKit::Transaction::Info,QString,QString)));
+ m_installProgress->setMaximum(0);
+ m_installProgress->setMinimum(0);
+ m_installProgress->show();
+ m_installSambaButton->hide();
+}
+
+void SambaUserSharePlugin::packageInstall(PackageKit::Transaction::Info info,
+ const QString &packageId,
+ const QString &summary)
+{
+ Q_UNUSED(info);
+ Q_UNUSED(summary);
+ PackageKit::Transaction *installTransaction =
PackageKit::Daemon::installPackage(packageId);
+ connect(installTransaction,
+ SIGNAL(finished(PackageKit::Transaction::Exit, uint)),
+ SLOT(packageFinished(PackageKit::Transaction::Exit, uint)));
+}
+
+void SambaUserSharePlugin::packageFinished(PackageKit::Transaction::Exit
status, uint runtime)
+{
+ m_installSambaWidgets->hide();
+ m_shareWidgets->show();
}
+#endif // SAMBA_INSTALL
void SambaUserSharePlugin::setupModel()
{
@@ -147,7 +167,7 @@
void SambaUserSharePlugin::load()
{
bool guestAllowed = false;
- bool sambaShared = KSambaShare::instance()->isDirectoryShared(url);
+ bool sambaShared = KSambaShare::instance()->isDirectoryShared(m_url);
propertiesUi.sambaChk->setChecked(sambaShared);
toggleShareStatus(sambaShared);
@@ -170,7 +190,7 @@
shareData.setName(propertiesUi.sambaNameEdit->text());
- shareData.setPath(url);
+ shareData.setPath(m_url);
KSambaShareData::GuestPermission guestOk(shareData.guestPermission());
@@ -180,7 +200,7 @@
shareData.setGuestPermission(guestOk);
result = shareData.save();
- } else if (KSambaShare::instance()->isDirectoryShared(url)) {
+ } else if (KSambaShare::instance()->isDirectoryShared(m_url)) {
result = shareData.remove();
}
}
@@ -211,19 +231,19 @@
}
if (disableButton) {
- properties->enableButtonOk(false);
+ properties->button(QDialogButtonBox::Ok)->setEnabled(false);
propertiesUi.sambaNameEdit->setFocus();
return;
}
- if (!properties->isButtonEnabled(KPropertiesDialog::Ok)) {
- properties->enableButtonOk(true);
+ if (!properties->button(QDialogButtonBox::Ok)->isEnabled()) {
+ properties->button(QDialogButtonBox::Ok)->setEnabled(true);
}
}
QString SambaUserSharePlugin::getNewShareName()
{
- QString shareName = KUrl(url).fileName();
+ QString shareName = QUrl(m_url).fileName();
if (!propertiesUi.sambaNameEdit->text().isEmpty()) {
shareName = propertiesUi.sambaNameEdit->text();
@@ -235,4 +255,4 @@
return shareName;
}
-#include "moc_sambausershareplugin.cpp"
+#include "sambausershareplugin.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdenetwork-filesharing-15.08.3/samba/filepropertiesplugin/sambausershareplugin.h
new/kdenetwork-filesharing-15.12.0/samba/filepropertiesplugin/sambausershareplugin.h
---
old/kdenetwork-filesharing-15.08.3/samba/filepropertiesplugin/sambausershareplugin.h
2014-07-25 07:40:03.000000000 +0200
+++
new/kdenetwork-filesharing-15.12.0/samba/filepropertiesplugin/sambausershareplugin.h
2015-10-16 12:30:25.000000000 +0200
@@ -23,8 +23,15 @@
#include <QVariant>
#include <QComboBox>
+#include <QProgressBar>
+#include <QPushButton>
+#ifdef SAMBA_INSTALL
+#include <PackageKit/Daemon>
+#include <PackageKit/Transaction>
+#endif // SAMBA_INSTALL
#include <kpropertiesdialog.h>
+#include <klocalizedstring.h>
#include "ui_sambausershareplugin.h"
@@ -42,19 +49,30 @@
private Q_SLOTS:
void load();
void toggleShareStatus(bool checked);
- void installSamba();
void checkShareName(const QString &name);
+#ifdef SAMBA_INSTALL
+ void installSamba();
+ void packageInstall(PackageKit::Transaction::Info info,
+ const QString &packageId,
+ const QString &summary);
+ void packageFinished(PackageKit::Transaction::Exit status, uint runtime);
+#endif // SAMBA_INSTALL
private:
- QString url;
+ QString m_url;
KSambaShareData shareData;
UserPermissionModel *model;
Ui::PropertiesPageGUI propertiesUi;
+ QWidget *m_installSambaWidgets;
+ QWidget *m_shareWidgets;
+ QProgressBar *m_installProgress;
+ QPushButton *m_installSambaButton;
void setupModel();
void setupViews();
QStringList getUsersList();
QString getNewShareName();
+
};
#endif // SAMBAUSERSHAREPLUGIN_H
