changed: name all part related files equally "filelightpart"

svn path=/trunk/playground/utils/filelight/; revision=1107422

misc/CMakeLists.txt

@@ -18,10 +18,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #######################################################################
 
-install(FILES filelight_part.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES filelightpart.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 install(FILES filelight.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
 install(FILES filelightrc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/config)
-install(FILES filelight_partui.rc DESTINATION ${DATA_INSTALL_DIR}/filelightpart)
+install(FILES filelightpartui.rc DESTINATION ${DATA_INSTALL_DIR}/filelightpart)
 install(FILES filelightui.rc DESTINATION ${DATA_INSTALL_DIR}/filelight)
 
 kde4_install_icons(${ICON_INSTALL_DIR})

misc/filelight_partui.rc → misc/filelightpartui.rc

 <!DOCTYPE kpartgui>
-<kpartgui name="filelight_part" version="2">
+<kpartgui name="filelightpart" version="2">
 <MenuBar>
   <Menu name="view">
     <Action name="view_zoom_in" group="view_merge_group"/>

src/app/mainWindow.cpp

@@ -55,7 +55,7 @@ namespace Filelight {
 
 MainWindow::MainWindow() : KParts::MainWindow(), m_part(0)
 {
-    setXMLFile("filelightui.rc");
+//     setXMLFile("filelightui.rc");
     KPluginFactory *factory = KPluginLoader("filelightpart").factory();
 
     if (!factory) {

src/part/part.cpp

@@ -49,7 +49,20 @@
 namespace Filelight {
 
 K_PLUGIN_FACTORY(filelightPartFactory, registerPlugin<Part>();)  // produce a factory
-K_EXPORT_PLUGIN(filelightPartFactory("filelightpart"))
+K_EXPORT_PLUGIN(filelightPartFactory(KAboutData(
+               "filelightpart",
+               0,
+               ki18n("Filelight"),
+               APP_VERSION,
+               ki18n("Displays file usage in an easy to understand way."),
+               KAboutData::License_GPL,
+               ki18n("(c) 2002-2004 Max Howell\n\
+                (c) 2008-2009 Martin T. Sandsmark"),
+               KLocalizedString(),
+               "http://iskrembilen.com/",
+               "sandsmark@iskrembilen.com").
+               setProgramIconName("filelight").
+               setCatalogName("filelight")))
 
 BrowserExtension::BrowserExtension(Part *parent)
         : KParts::BrowserExtension(parent)
@@ -65,9 +78,8 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QList<QVariant>&)
         , m_started(false)
 {
     Config::read();
-    KGlobal::locale()->insertCatalog("filelight");
     setComponentData(filelightPartFactory::componentData());
-    setXMLFile("filelight_partui.rc");
+    setXMLFile("filelightpartui.rc");
 
     setWidget(new QWidget(parentWidget));
     widget()->setBackgroundRole(QPalette::Base);
@@ -75,7 +87,7 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QList<QVariant>&)
 
     m_layout = new QGridLayout(widget());
     widget()->setLayout(m_layout);
-    
+
     m_manager = new ScanManager(widget());
 
     m_map = new RadialMap::Widget(widget());
@@ -211,23 +223,6 @@ Part::configFilelight()
     dialog->show(); //deletes itself
 }
 
-KAboutData*
-Part::createAboutData()
-{
-    return new KAboutData(
-               "filelight",
-               0,
-               ki18n("Filelight"),
-               APP_VERSION,
-               ki18n("Displays file usage in an easy to understand way."),
-               KAboutData::License_GPL,
-               ki18n("(c) 2002-2004 Max Howell\n\
-			    (c) 2008-2009 Martin T. Sandsmark"),
-               KLocalizedString(),
-               "http://iskrembilen.com/",
-               "sandsmark@iskrembilen.com");
-}
-
 bool
 Part::start(const KUrl &url)
 {

src/part/part.h

@@ -64,8 +64,6 @@ public:
         return url().protocol() == "file" ? url().path() : url().prettyUrl();
     }
 
-    static KAboutData *createAboutData();
-
 public slots:
     virtual bool openUrl(const KUrl&);
     void configFilelight();