[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesdk/kbabel/catalogmanager
From:       Bram Schoenmakers <bramschoenmakers () kde ! nl>
Date:       2004-07-05 20:38:34
Message-ID: 20040705203834.21BBF99B2 () office ! kde ! org
[Download RAW message or body]

CVS commit by bram: 

Make the catalogmanager only commit modified files when giving the
"Commit"-command when selecting a directory. The former behaviour didn't
make sense, it included all files for commit, modified or not.


  M +2 -2      catalogmanagerview.cpp   1.96
  M +24 -23    catmanlistitem.cpp   1.30
  M +24 -23    catmanlistitem.h   1.15


--- kdesdk/kbabel/catalogmanager/catalogmanagerview.cpp  #1.95:1.96
@@ -1064,5 +1064,5 @@ void CatalogManagerView::doCVSCommand( C
     if ( cmd == CVS::Commit && item->isDir( ) ) {
       // all children including directories
-      QStringList cvsItems = item->allChildrenFileList ();
+      QStringList cvsItems = item->allChildrenFileList (false, false, true);
       if ( !cvsItems.isEmpty( ) )
         cvshandler->execCVSCommand(cmd, cvsItems, templates);

--- kdesdk/kbabel/catalogmanager/catmanlistitem.cpp  #1.29:1.30
@@ -196,5 +196,5 @@ QStringList CatManListItem::allChildrenL
 
 
-QStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs) \
const +QStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool \
emptyDirs, bool onlyModified) const  {
    QStringList childrenList;
@@ -203,5 +203,6 @@ QStringList CatManListItem::allChildrenF
    while( myChild )
    {
-      if(myChild->isFile() && myChild->hasPo())
+      if(myChild->isFile() && myChild->hasPo() &&
+       !(!myChild->isModified()&&onlyModified))
       {
          childrenList.append(myChild->poFile());
@@ -214,5 +215,5 @@ QStringList CatManListItem::allChildrenF
         }
 
-         childrenList+=myChild->allChildrenFileList(onlyFiles);
+         childrenList+=myChild->allChildrenFileList(onlyFiles,false,onlyModified);
       }
 

--- kdesdk/kbabel/catalogmanager/catmanlistitem.h  #1.14:1.15
@@ -74,7 +74,8 @@ public:
    * @param onlyFiles flag, if only the names of files should be returned
    * @param emptyDirs flag, if the empty dirs (dirs without PO files in them) should \
be returned +   * @param onlyModified, if only modified files should be returned
    * @see CatManListItem::contentsList
    */
-   QStringList allChildrenFileList(bool onlyFiles=false, bool emptyDirs=false) \
const; +   QStringList allChildrenFileList(bool onlyFiles=false, bool \
emptyDirs=false, bool onlyModified=false) const;  
    void setMarked(bool on);


[prev in list] [next in list] [prev in thread] [next in thread]