Branch: master

563adb52 2019-04-14 15:06:17 Michele Calgaro
Renamed kcm_trash to kcmtrash and minor fixup to previous commits.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
A tdeioslave/trash/kcmtrash.cpp
A tdeioslave/trash/kcmtrash.desktop
A tdeioslave/trash/kcmtrash.h
M tdeioslave/trash/CMakeLists.txt
M tdeioslave/trash/Makefile.am
R tdeioslave/trash/kcm_trash.cpp
R tdeioslave/trash/kcm_trash.desktop
R tdeioslave/trash/kcm_trash.h

tdeioslave/trash/CMakeLists.txt

diff --git a/tdeioslave/trash/CMakeLists.txt b/tdeioslave/trash/CMakeLists.txt
index 2f1b184..cb3c3c2 100644
--- a/tdeioslave/trash/CMakeLists.txt
+++ b/tdeioslave/trash/CMakeLists.txt
@@ -26,7 +26,7 @@
 ##### other data ################################
 
 install( FILES ktrashpropsdlgplugin.desktop trash.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kcm_trash.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES kcmtrash.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
 ##### trashcommon (static) ######################
@@ -51,7 +51,7 @@
 set( target kcm_trash )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES kcm_trash.cpp
+  SOURCES kcmtrash.cpp
   LINK trashcommon-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeioslave/trash/Makefile.am

diff --git a/tdeioslave/trash/Makefile.am b/tdeioslave/trash/Makefile.am
index cee2825..5d0d9b3 100644
--- a/tdeioslave/trash/Makefile.am
+++ b/tdeioslave/trash/Makefile.am
@@ -3,13 +3,13 @@
 
 SUBDIRS = . tdefile-plugin
 
-kde_module_LTLIBRARIES = tdeio_trash.la kcm_trash ktrashpropsdlgplugin.la
+kde_module_LTLIBRARIES = tdeio_trash.la kcm_trash.la ktrashpropsdlgplugin.la
 
 tdeio_trash_la_SOURCES = tdeio_trash.cpp
 tdeio_trash_la_LIBADD  = libtrashcommon.la $(LIB_TDEIO)
 tdeio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
-kcm_trash_la_SOURCES = kcm_trash.cpp
+kcm_trash_la_SOURCES = kcmtrash.cpp
 kcm_trash_la_LIBADD  = libtrashcommon.la $(LIB_TDEIO)
 kcm_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 
@@ -43,4 +43,4 @@
 services_DATA = ktrashpropsdlgplugin.desktop
 servicesdir = $(kde_servicesdir)
 
-xdg_apps_DATA = kcm_trash.desktop
+xdg_apps_DATA = kcmtrash.desktop

tdeioslave/trash/kcm_trash.cpp

diff --git a/tdeioslave/trash/kcm_trash.cpp b/tdeioslave/trash/kcm_trash.cpp
deleted file mode 100644
index 3a915fa..0000000
--- a/tdeioslave/trash/kcm_trash.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-   This file is part of the TDE Project
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "kcm_trash.h"
-#include "ktrashpropswidget.h"
-
-#include <tqlayout.h>
-#include <tqtabwidget.h>
-#include <tdelocale.h>
-#include <tdeglobal.h>
-#include <tdeaboutdata.h>
-#include <kdialog.h>
-
-
-extern "C"
-{
-  KDE_EXPORT TDECModule *create_trash(TQWidget *parent, const char *)
-  {
-    return new TrashModule(parent, "trash");
-  }
-}
-
-
-TrashModule::TrashModule(TQWidget *parent, const char *name)
-	: TDECModule(parent, name)
-{
-	TDEAboutData * about = new TDEAboutData("trash",
-	                                    I18N_NOOP("Trash"), "1",
-	                                    I18N_NOOP("Trash Control Panel Module"),
-	                                    TDEAboutData::License_GPL_V2,
-	                                    I18N_NOOP("(c) 2019 Michele Calgaro"));
-	setAboutData( about );
-  TDEGlobal::locale()->insertCatalogue("trash");
-
-  tab = new TQTabWidget(this);
-
-	policyWidget = new KTrashPropsWidget(this);
-  tab->addTab(policyWidget, i18n("&Trash Policy"));
-  connect(policyWidget, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
-
-  TQVBoxLayout *top = new TQVBoxLayout(this);
-  top->addWidget(tab);
-}
-
-void TrashModule::load()
-{
-  policyWidget->load();
-}
-
-void TrashModule::save()
-{
-  policyWidget->save();
-}
-
-void TrashModule::defaults()
-{
-  policyWidget->setDefaultValues();
-}
-
-TQString TrashModule::quickHelp() const
-{
-  return i18n("<h1>Trash</h1> Here you can choose the settings "
-              "for your Trash Bin size and clean up policy. ");
-}
-
-#include "kcm_trash.moc"

tdeioslave/trash/kcm_trash.desktop

diff --git a/tdeioslave/trash/kcm_trash.desktop b/tdeioslave/trash/kcm_trash.desktop
deleted file mode 100644
index 83b70c9..0000000
--- a/tdeioslave/trash/kcm_trash.desktop
+++ /dev/null
@@ -1,24 +0,0 @@
-[Desktop Entry]
-Exec=tdecmshell kcm_trash
-Icon=trashcan_empty
-Type=Application
-#X-DocPath=kcontrol/kcmcgi/index.html
-
-X-TDE-ModuleType=Library
-X-TDE-Library=trash
-Categories=Qt;TDE;X-TDE-settings-system;
-
-Name=Trash
-Name[cz]=Koš
-Name[fr]=Corbeille
-Name[it]=Cestino
-
-Comment=Trash Properties
-Comment[cz]=Vlastnosti koše
-Comment[fr]=Propriétés de la Corbeille
-Comment[it]=Proprietà del cestino
-
-Keywords=trash;properties;size;limits;delete
-Keywords[cz]=koš,vlastnosti,velikost,limity,odstranit
-Keywords[fr]=corbeille;propriétés;taille;limites;supprimer
-Keywords[it]=cestino;proprietà;dimensioni;limiti;cancella

tdeioslave/trash/kcm_trash.h

diff --git a/tdeioslave/trash/kcm_trash.h b/tdeioslave/trash/kcm_trash.h
deleted file mode 100644
index 4987ccf..0000000
--- a/tdeioslave/trash/kcm_trash.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-   This file is part of the TDE Project
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KCM_TRASH_H
-#define KCM_TRASH_H
-
-#include <tdecmodule.h>
-
-class KTrashPropsPanel;
-class KTrashPropsWidget;
-class TQTabWidget;
-
-class TrashModule : public TDECModule
-{
-	Q_OBJECT
-
-public:
-	TrashModule(TQWidget *parent, const char *name);
-
-	virtual void load();
-	virtual void save();
-	virtual void defaults();
-	virtual TQString quickHelp() const;
-
-private:
-  TQTabWidget	*tab;
-	KTrashPropsWidget *policyWidget;
-
-protected slots:
-};
-
-#endif

tdeioslave/trash/kcmtrash.cpp

diff --git a/tdeioslave/trash/kcmtrash.cpp b/tdeioslave/trash/kcmtrash.cpp
new file mode 100644
index 0000000..4747e09
--- /dev/null
+++ b/tdeioslave/trash/kcmtrash.cpp
@@ -0,0 +1,81 @@
+/*
+   This file is part of the TDE Project
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License version 2 as published by the Free Software Foundation.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "kcmtrash.h"
+#include "ktrashpropswidget.h"
+
+#include <tqlayout.h>
+#include <tqtabwidget.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeaboutdata.h>
** Diff limit reached (max: 250 lines) **