apollon-cvs Mailing List for Apollon (Page 25)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/apollon/apollon/apollon
In directory sc8-pr-cvs1:/tmp/cvs-serv16586

Modified Files:
	apollonsharedviewtab.h apollonsharedviewtab.cpp 
Log Message:
fixed a little bug for moving files.
and a small method-change.


Index: apollonsharedviewtab.h
===================================================================
RCS file: /cvsroot/apollon/apollon/apollon/apollonsharedviewtab.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** apollonsharedviewtab.h	2 Jul 2003 15:17:53 -0000	1.1.1.1
--- apollonsharedviewtab.h	5 Jul 2003 14:29:42 -0000	1.2
***************
*** 53,57 ****
         KFileTreeViewItem* currentItem;
         ApollonPlayerTab *m_playerTab;
!        int id;
  
  
--- 53,57 ----
         KFileTreeViewItem* currentItem;
         ApollonPlayerTab *m_playerTab;
!        int m_id;
  
  
***************
*** 72,76 ****
       void play(QListViewItem*);
       void sltRename(QListViewItem*, int);
-      void sltMoveBrowse();
       void sltMoveTo(int);
  };
--- 72,75 ----

Index: apollonsharedviewtab.cpp
===================================================================
RCS file: /cvsroot/apollon/apollon/apollon/apollonsharedviewtab.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** apollonsharedviewtab.cpp	2 Jul 2003 15:17:53 -0000	1.1.1.1
--- apollonsharedviewtab.cpp	5 Jul 2003 14:29:42 -0000	1.2
***************
*** 87,97 ****
  	popupmenu->setItemEnabled(2, FALSE);
  	popupmenu->setItemEnabled(4, TRUE);
! 	
  	moveToPopup = new KPopupMenu(listView);
  	popupmenu->insertItem(tr2i18n("Move to:..."), moveToPopup);
! 	moveToPopup->insertItem(tr2i18n("Browse..."), this, SLOT(sltMoveBrowse())); //work!!
  	moveToPopup->insertSeparator();
  	connect(moveToPopup, SIGNAL(activated(int)), this, SLOT(sltMoveTo(int)));
! 	id = 0;
  }
  
--- 87,99 ----
  	popupmenu->setItemEnabled(2, FALSE);
  	popupmenu->setItemEnabled(4, TRUE);
! 
! 	m_id = 0;
  	moveToPopup = new KPopupMenu(listView);
  	popupmenu->insertItem(tr2i18n("Move to:..."), moveToPopup);
! 	cout << " puff id " << m_id << endl;
! 	moveToPopup->insertItem(tr2i18n("Browse..."), m_id++); //work!!
  	moveToPopup->insertSeparator();
  	connect(moveToPopup, SIGNAL(activated(int)), this, SLOT(sltMoveTo(int)));
! 
  }
  
***************
*** 114,118 ****
      //adding the subdirs
      KIconLoader *loader = KGlobal::iconLoader();
!     moveToPopup->insertItem(loader->loadIcon("folder", KIcon::Small), path, id++);
    }
  }
--- 116,120 ----
      //adding the subdirs
      KIconLoader *loader = KGlobal::iconLoader();
!     moveToPopup->insertItem(loader->loadIcon("folder", KIcon::Small), path, m_id++);
    }
  }
***************
*** 199,228 ****
  
  
! void ApollonSharedViewTab::sltMoveBrowse() {
    currentItem = static_cast<ApollonSharedViewItem*>(listView->currentItem());
- 
-   KURL newUrl = KDirSelectDialog::selectDirectory();
    
!   if (!newUrl.isEmpty()) {
      KURL url = currentItem->path();
      QString filename = url.fileName();
      QDir dir;
!     QString newPath = newUrl.path() + QString("/") + filename;
      QString oldPath = url.path();
      if (!dir.rename(oldPath, newPath))
!       KMessageBox::error(this, tr2i18n("Couldn't move file or directory!"), tr2i18n("Error!"));
    }
- }
-   
- 
- 
- void ApollonSharedViewTab::sltMoveTo(int id) {
-   currentItem = static_cast<ApollonSharedViewItem*>(listView->currentItem());
-   KURL url = currentItem->path();
-   QString filename = url.fileName();
-   QDir dir;
-   QString newPath = moveToPopup->text(id)  + QString("/") + filename;
-   QString oldPath = url.path();
-   if (!dir.rename(oldPath, newPath))
-     KMessageBox::error(this, tr2i18n("Couldn't move file or directory!"), tr2i18n("Error!"));
  }
--- 201,231 ----
  
  
! void ApollonSharedViewTab::sltMoveTo(int id) {
!   
    currentItem = static_cast<ApollonSharedViewItem*>(listView->currentItem());
    
!   if (id == 0) {  //browse
!     KURL newUrl = KDirSelectDialog::selectDirectory();
!   
!     if (!newUrl.isEmpty()) {
!       KURL url = currentItem->path();
!       QString filename = url.fileName();
!       QDir dir;
!       QString newPath = newUrl.path() + QString("/") + filename;
!       QString oldPath = url.path();
!       if (!dir.rename(oldPath, newPath))
! 	KMessageBox::error(this, tr2i18n("Couldn't move file or directory!"), tr2i18n("Error!"));
!     }
! 
!   }
!   else {
!     currentItem = static_cast<ApollonSharedViewItem*>(listView->currentItem());
      KURL url = currentItem->path();
      QString filename = url.fileName();
      QDir dir;
!     QString newPath = moveToPopup->text(id)  + QString("/") + filename;
      QString oldPath = url.path();
      if (!dir.rename(oldPath, newPath))
!       KMessageBox::error(this, tr2i18n("Couldn't move file or directory2!"), tr2i18n("Error!"));
    }
  }

2003	Jan	Feb	Mar	Apr	May	Jun	Jul (47)	Aug (52)	Sep (59)	Oct (8)	Nov (13)	Dec (33)
2004	Jan (33)	Feb (18)	Mar (12)	Apr (95)	May (39)	Jun (11)	Jul (55)	Aug (61)	Sep (18)	Oct (20)	Nov (5)	Dec (1)
2005	Jan (1)	Feb (2)	Mar (4)	Apr (3)	May (16)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2006	Jan	Feb	Mar	Apr	May (2)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

apollon-cvs Mailing List for Apollon (Page 25)

apollon-cvs — just for cvs-notifications as commits