Bug 101097 - Context menu of folders in the feed list should read "Rename folder.." not "Edit feed.."
Summary: Context menu of folders in the feed list should read "Rename folder.." not "E...
Status: RESOLVED FIXED
Alias: None
Product: akregator
Classification: Applications
Component: general (show other bugs)
Version: 1.0
Platform: unspecified Linux
: NOR normal
Target Milestone: ---
Assignee: kdepim bugs
URL:
Keywords:
: 101353 (view as bug list)
Depends on:
Blocks:
 
Reported: 2005-03-08 14:08 UTC by Joonas Koivunen
Modified: 2005-03-13 23:47 UTC (History)
1 user (show)

See Also:
Latest Commit:
Version Fixed In:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Joonas Koivunen 2005-03-08 14:08:54 UTC
Version:           1.0 (using KDE 3.4.0, compiled sources)
Compiler:          gcc version 3.3.4
OS:                Linux (i686) release 2.4.26

Cosmetics bug;

By the feed list I refer to the list on the left in the default view configuration, right clicking on a folder brings up a context menu which has:

"Edit feed.." to rename the folder, it should be "Rename folder.." or something like that.
Comment 1 Teemu Rytilahti 2005-03-09 05:24:40 UTC
CVS commit by rytilahti: 

Use folder instead of feed for folder menus. Fixes also remove feed dialog's title when removing whole folder.

Same commit includes lines which starts KNotifyClient if necessary. Should make notifications work for users without full kde desktop.

BUGS:101097


  M +17 -1     akregator_part.cpp   1.154
  M +1 -0      akregator_part.h   1.67
  M +12 -13    akregator_part.rc   1.40
  M +1 -1      akregator_view.cpp   1.228
  M +4 -0      main.cpp   1.31



Comment 2 Teemu Rytilahti 2005-03-13 23:06:32 UTC
*** Bug 101353 has been marked as a duplicate of this bug. ***
Comment 3 Teemu Rytilahti 2005-03-13 23:47:43 UTC
CVS commit by rytilahti: 

Make shortcuts work again. This is a bit hacky, but no one had a better idea...
CCBUGS:101097


  M +0 -4      akregator_part.cpp   1.156
  M +5 -5      akregator_part.rc   1.42
  M +12 -2     akregator_view.cpp   1.229


--- kdepim/akregator/src/akregator_part.cpp  #1.155:1.156
@@ -97,7 +97,5 @@ void Part::setupActions()
     new KAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", m_view, SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
     new KAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", m_view, SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
-    new KAction(i18n("&Delete Folder"), "editdelete", "Alt+Delete", m_view, SLOT(slotFeedRemove()), actionCollection(), "group_remove");
     new KAction(i18n("&Edit Feed..."), "edit", "F2", m_view, SLOT(slotFeedModify()), actionCollection(), "feed_modify");
-    new KAction(i18n("&Rename Folder..."), "edit", "F2", m_view, SLOT(slotFeedModify()), actionCollection(), "group_modify");
 
     KActionMenu* vm = new KActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" );
@@ -117,10 +115,8 @@ void Part::setupActions()
     // toolbar / feed menu
     new KAction(i18n("&Fetch Feed"), "down", "Ctrl+L", m_view, SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
-    new KAction(i18n("&Fetch Feeds"), "down", "Ctrl+L", m_view, SLOT(slotFetchCurrentFeed()), actionCollection(), "group_fetch");
     new KAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+Shift+L", m_view, SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
     new KAction(i18n( "&Abort Fetches" ), "stop", Key_Escape, this, SLOT( slotStop() ), actionCollection(), "feed_stop");
 
     new KAction(i18n("&Mark Feed as Read"), "apply", "Ctrl+R", m_view, SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
-    new KAction(i18n("&Mark Feeds as Read"), "apply", "Ctrl+R", m_view, SLOT(slotMarkAllRead()), actionCollection(), "group_mark_all_as_read");
     new KAction(i18n("Ma&rk All Feeds as Read"), "apply", "Ctrl+Shift+R", m_view, SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read");
 

--- kdepim/akregator/src/akregator_part.rc  #1.41:1.42
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="akregator_part" version="46">
+<kpartgui name="akregator_part" version="47">
 <MenuBar>
   <Menu name="file">
@@ -113,12 +113,12 @@
 
 <Menu name="feedgroup_popup">
-    <Action name="group_mark_all_as_read"/>
+    <Action name="feed_mark_all_as_read"/>
     <Separator/>
-    <Action name="group_fetch"/>
+    <Action name="feed_fetch"/>
     <Separator/>
     <Action name="feed_add"/>
     <Action name="feed_add_group"/>
-    <Action name="group_modify"/>
-    <Action name="group_remove"/>
+    <Action name="feed_modify"/>
+    <Action name="feed_remove"/>
 </Menu>
 

--- kdepim/akregator/src/akregator_view.cpp  #1.228:1.229
@@ -695,8 +695,18 @@ void View::slotFeedTreeContextMenu(KList
     
     QWidget *w;
-    if (node->isGroup())
+    if (node->isGroup()) {
         w = m_part->factory()->container("feedgroup_popup", m_part);
-    else
+        m_part->actionCollection()->action("feed_fetch")->setText("&Fetch Feeds");
+        m_part->actionCollection()->action("feed_remove")->setText("&Delete Folder");
+        m_part->actionCollection()->action("feed_modify")->setText("&Rename Folder");
+        m_part->actionCollection()->action("feed_mark_all_as_read")->setText("&Mark Feeds as Read");
+    }
+    else {
         w = m_part->factory()->container("feeds_popup", m_part);
+        m_part->actionCollection()->action("feed_fetch")->setText("&Fetch Feed");
+        m_part->actionCollection()->action("feed_remove")->setText("&Delete Feed");
+        m_part->actionCollection()->action("feed_modify")->setText("&Edit Feed...");
+        m_part->actionCollection()->action("feed_mark_all_as_read")->setText("&Mark Feed as Read");
+    }
     if (w)
         static_cast<QPopupMenu *>(w)->exec(p);