Bug 85481

Akregator self-compiled from sources. Kontact from the Cooker 3.2.3 rpm's on MDK 10

CVS commit by sashmit: 

first part of usability improvements with respect to document orientation:

- remove save action from part
- remove save as from part
- remove new from shell
- autosave on any change to the feed list

as a sideeffect, things should be sync'd between the shell and kontact

CCMAIL: 85481-done@bugs.kde.org


  M +0 -1      akregator.cpp   1.50
  M +5 -17     akregator_part.cpp   1.76
  M +0 -3      akregator_part.rc   1.20
  M +0 -1      akregator_shell.rc   1.12
  M +0 -2      akregator_view.cpp   1.117


--- kdenonbeta/akregator/src/akregator.cpp  #1.49:1.50
@@ -178,5 +178,4 @@ void aKregator::setupActions()
     connectActionCollection(actionCollection());
 
-    KStdAction::openNew(this, SLOT(fileNew()), actionCollection());
     KStdAction::quit(this, SLOT(quitProgram()), actionCollection());
 

--- kdenonbeta/akregator/src/akregator_part.cpp  #1.75:1.76
@@ -58,9 +58,8 @@ aKregatorPart::aKregatorPart( QWidget *p
     // create our actions
     KStdAction::open(this, SLOT(fileOpen()), actionCollection());
-    KStdAction::saveAs(this, SLOT(fileSaveAs()), actionCollection());
-    KStdAction::save(this, SLOT(save()), actionCollection());
     recentFilesAction = KStdAction::openRecent( this, SLOT(openURL(const KURL&)), actionCollection(), "file_open_recent" );
 
     new KAction(i18n("&Import Feeds..."), "", "", this, SLOT(fileImport()), actionCollection(), "file_import");
+    new KAction(i18n("&Export Feeds..."), "", "", this, SLOT(fileImport()), actionCollection(), "file_import");
 
     /* -- ACTIONS */
@@ -96,5 +95,5 @@ aKregatorPart::aKregatorPart( QWidget *p
 
     // we are not modified since we haven't done anything yet
-    setModified(false);
+//    setModified(false);
 
     connect(parent, SIGNAL(markAllFeedsRead()), m_view, SLOT(slotMarkAllFeedsRead()));
@@ -126,18 +125,7 @@ void aKregatorPart::setReadWrite(bool rw
 void aKregatorPart::setModified(bool modified)
 {
-    // get a handle on our Save action and make sure it is valid
-    KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
-    if (!save)
-        return;
-
-    // if so, we either enable or disable it based on the current
-    // state
-    if (modified)
-        save->setEnabled(true);
-    else
-        save->setEnabled(false);
-
-    // in any event, we want our parent to do it's thing
-    ReadWritePart::setModified(modified);
+    // autosave
+    if (url().isValid() && modified)
+        saveFile();
 }
 

--- kdenonbeta/akregator/src/akregator_part.rc  #1.19:1.20
@@ -6,7 +6,4 @@
     <Action name="file_open_recent"/>
     <Separator/>
-    <Action name="file_save"/>
-    <Action name="file_save_as"/>
-    <Separator/>
     <Action name="file_import"/>
   </Menu>

--- kdenonbeta/akregator/src/akregator_shell.rc  #1.11:1.12
@@ -3,5 +3,4 @@
 <MenuBar>
   <Menu noMerge="1" name="file"><text>&amp;File</text>
-    <Action name="file_new"/>
     <Merge/>
     <Separator/>

--- kdenonbeta/akregator/src/akregator_view.cpp  #1.116:1.117
@@ -318,5 +318,4 @@ void aKregatorView::reset()
     m_feeds.clearFeeds();
     m_tree->clear();
-    m_part->setModified(false);
 
     // Root item
@@ -604,5 +603,4 @@ void aKregatorView::addFeedToGroup(const
             g->setTitle( group );
 
-        m_part->setModified(true);
         item = g->item();
     }