[Kde-pim] KDE/kdepim/akregator/src

[Rafael Fernández López]

SVN commit 856236 by ereslibre:

Do not make entries be repeated when embedding Akregator on Kontact. Also, there is a problem with KStandardActions::preferences, which when being
embedded into Kontact, still the entry was "Configure Kontact", instead of "Configure Akregator". I will look at this, since this method should check
activeComponent() for this.

I wonder if this can be backported, since it adds a new string to be translated. For this reason, I am CC'ing to the kde-pim mailing list.

CCMAIL: kde-pim at kde.org


 M  +4 -7      actionmanagerimpl.cpp  
 M  +2 -2      akregator_part.cpp  
 M  +1 -4      akregator_part.rc  
 M  +4 -2      mainwindow.cpp  


--- trunk/KDE/kdepim/akregator/src/actionmanagerimpl.cpp #856235:856236
@@ -176,14 +176,11 @@
     action->setIcon(KIcon("document-export"));
     connect(action, SIGNAL(triggered(bool)), d->part, SLOT(fileExport()));
 
-    KStandardAction::configureNotifications(d->part, SLOT(showKNotifyOptions()), d->actionCollection); // options_configure_notifications
+    KAction *configure = d->actionCollection->addAction("options_configure");
+    configure->setText(i18n("&Configure Akregator..."));
+    configure->setIcon(KIcon("configure"));
+    connect(configure, SIGNAL(triggered()), d->part, SLOT(showOptions()));
 
-    KStandardAction::keyBindings(d->part->parent(), SLOT(optionsConfigureKeys()), d->actionCollection); // options_configure_keybinding
-
-    KStandardAction::configureToolbars(d->part->parent(), SLOT(optionsConfigureToolbars()), d->actionCollection); // options_configure_toolbars
-
-    KStandardAction::preferences(d->part, SLOT(showOptions()), d->actionCollection); // options_configure
-
     /*action = d->actionCollection->addAction("akregator_configure_akregator");
     action->setIcon(KIcon("configure"));
     action->setText(i18n("Configure &Akregator..."));
--- trunk/KDE/kdepim/akregator/src/akregator_part.cpp #856235:856236
@@ -59,6 +59,7 @@
 #include <KParts/GenericFactory>
 #include <KParts/Plugin>
 #include <KCMultiDialog>
+#include <kstandardaction.h>
 
 #include <QFile>
 #include <QObject>
@@ -106,6 +107,7 @@
     setPluginInterfaceVersion( AKREGATOR_PLUGIN_INTERFACE_VERSION );
 
     setComponentData( AkregatorFactory::componentData() );
+    setXMLFile("akregator_part.rc", true);
 
     new PartAdaptor( this );
     QDBusConnection::sessionBus().registerObject("/Akregator", this);
@@ -178,8 +180,6 @@
     connect(m_autosaveTimer, SIGNAL(timeout()), this, SLOT(slotSaveFeedList()));
     m_autosaveTimer->start(5*60*1000); // 5 minutes
 
-    setXMLFile("akregator_part.rc", true);
-
     initFonts();
 
     QString useragent = QString( "Akregator/%1; syndication" ).arg( AKREGATOR_VERSION );
--- trunk/KDE/kdepim/akregator/src/akregator_part.rc #856235:856236
@@ -73,10 +73,7 @@
    <text>&Settings</text>
    <Merge name="StandardToolBarMenuHandler" />
    <Action name="show_quick_filter" />
-   <Separator/>
-   <Action group="settings_configure" name="options_configure_keybinding" />
-   <Action group="settings_configure" name="options_configure_notifications" />
-   <Action group="settings_configure" name="options_configure_toolbars" />
+   <Merge/>
    <Action group="settings_configure" name="options_configure" />
   </Menu>
 
--- trunk/KDE/kdepim/akregator/src/mainwindow.cpp #856235:856236
@@ -65,6 +65,10 @@
     // set the shell's ui resource file
     setXMLFile("akregator_shell.rc");
 
+    KStandardAction::configureNotifications(m_part, SLOT(showKNotifyOptions()), actionCollection()); // options_configure_notifications
+    KStandardAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); // options_configure_keybinding
+    KStandardAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); // options_configure_toolbars
+
     toolBar()->show();
     statusBar()->show();
 
@@ -79,8 +83,6 @@
     KStandardAction::showMenubar( menuBar(), SLOT(setVisible(bool)), actionCollection());
     setStandardToolBarMenuEnabled(true);
     createStandardStatusBarAction();
-
-    createGUI(0L);
 }
 
 bool MainWindow::loadPart()
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/