Attachment #1589 for bug #1677

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1677
Collapse All | Expand All

Lines 138-144 Link Here

(-)ori/tdebase/konqueror/listview/konq_listview.cc (-1 / +25 lines)
138	emit enableAction( "del", canDel > 0 );	138	emit enableAction( "del", canDel > 0 );
139	emit enableAction( "properties", lstItems.count() > 0 && KPropertiesDialog::canDisplay( lstItems ) );	139	emit enableAction( "properties", lstItems.count() > 0 && KPropertiesDialog::canDisplay( lstItems ) );
140	emit enableAction( "editMimeType", ( lstItems.count() == 1 ) );	140	emit enableAction( "editMimeType", ( lstItems.count() == 1 ) );
141	emit enableAction( "rename", ( m_listView->listViewWidget()->currentItem() != 0 )&& !bInTrash );	141	emit enableAction( "rename", ( m_listView->listViewWidget()->currentItem() != 0 ) && !bInTrash );
142	}	142	}
143		143
144	void ListViewBrowserExtension::copySelection( bool move )	144	void ListViewBrowserExtension::copySelection( bool move )
Lines 161-166 Link Here
161	{	161	{
162	TQListViewItem* item = m_listView->listViewWidget()->currentItem();	162	TQListViewItem* item = m_listView->listViewWidget()->currentItem();
163	Q_ASSERT ( item );	163	Q_ASSERT ( item );
		164
		165	// Update shurtcuts for the 'rename and move' actions. Must be done every time since the
		166	// shortcuts may have been changed by the user in the meanwhile
		167	const TDEShortcut moveNextSC=m_listView->m_paRenameMoveNext->shortcut();
		168	const TDEShortcut movePrevSC=m_listView->m_paRenameMovePrev->shortcut();
		169	m_listView->listViewWidget()->setRenameSettings(TDEListViewRenameSettings(
		170	!(moveNextSC.isNull() && movePrevSC.isNull()), moveNextSC, movePrevSC));
		171
164	m_listView->listViewWidget()->rename( item, 0 );	172	m_listView->listViewWidget()->rename( item, 0 );
165		173
166	// Enhanced rename: Don't highlight the file extension.	174	// Enhanced rename: Don't highlight the file extension.
Lines 671-676 Link Here
671	m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" );	679	m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" );
672	m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" );	680	m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" );
673		681
		682	// These 2 actions are 'fake' actions. They are defined so that the keyboard shortcuts
		683	// can be set from the 'Configure Shortcuts..." dialog.
		684	// The real actions are performed in the TDEListViewLineEdit::keyPressEvent() in tdeui
		685	m_paRenameMoveNext = new TDEAction(i18n( "&Rename and move to next item" ), Key_Tab,
		686	NULL, NULL, actionCollection(), "renameMoveNext" );
		687	m_paRenameMoveNext->setWhatsThis(i18n("Pressing this button completes the current rename operation,"
		688	"moves to the next item and starts a new rename operation."));
		689	m_paRenameMoveNext->setToolTip( i18n("Complete rename operation and move the next item"));
		690	m_paRenameMoveNext->setEnabled(false);
		691	m_paRenameMovePrev = new TDEAction( i18n( "&Rename and move to previous item" ), SHIFT+Key_BackTab,
		692	NULL, NULL, actionCollection(), "renameMovePrev" );
		693	m_paRenameMovePrev->setWhatsThis(i18n("Pressing this button completes the current rename operation,"
		694	"moves to the previous item and starts a new rename operation."));
		695	m_paRenameMovePrev->setToolTip( i18n("Complete rename operation and move the previous item"));
		696	m_paRenameMovePrev->setEnabled(false);
		697
674	m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" );	698	m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" );
675	// m_paShowDot->setCheckedState(i18n("Hide &Hidden Files"));	699	// m_paShowDot->setCheckedState(i18n("Hide &Hidden Files"));
676	m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" );	700	m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" );

Lines 62-67 Link Here

(-)ori/tdebase/konqueror/listview/konq_listview.h (+7 lines)
62	class KonqListView : public KonqDirPart	62	class KonqListView : public KonqDirPart
63	{	63	{
64	friend class KonqBaseListViewWidget;	64	friend class KonqBaseListViewWidget;
		65	friend class ListViewBrowserExtension;
65	Q_OBJECT	66	Q_OBJECT
66	TQ_PROPERTY( bool supportsUndo READ supportsUndo )	67	TQ_PROPERTY( bool supportsUndo READ supportsUndo )
67	public:	68	public:
Lines 153-158 Link Here
153	TDEAction *m_paUnselectAll;	154	TDEAction *m_paUnselectAll;
154	TDEAction *m_paInvertSelection;	155	TDEAction *m_paInvertSelection;
155		156
		157	// These 2 actions are 'fake' actions. They are defined so that the keyboard shortcuts
		158	// can be set from the 'Configure Shortcuts..." dialog.
		159	// The real actions are performed in the TDEListViewLineEdit::keyPressEvent() in tdeui
		160	TDEAction *m_paRenameMoveNext;
		161	TDEAction *m_paRenameMovePrev;
		162
156	TDEToggleAction *m_paCaseInsensitive;	163	TDEToggleAction *m_paCaseInsensitive;
157		164
158	TDEToggleAction *m_paShowDot;	165	TDEToggleAction *m_paShowDot;




#endif
   connect( this, TQT_SIGNAL(returnPressed( TQListViewItem * )),
            this, TQT_SLOT(slotReturnPressed( TQListViewItem * )) );
   connect( this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )),
            this, TQT_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) );
   connect( this, TQT_SIGNAL(executed( TQListViewItem * )),
            this, TQT_SLOT(slotExecuted( TQListViewItem * )) );

   connect( this, TQT_SIGNAL(currentChanged( TQListViewItem * )),
            this, TQT_SLOT(slotCurrentChanged( TQListViewItem * )) );
   connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )),
            this, TQT_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) );
   connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )),
            this, TQT_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) );
   connect( this, TQT_SIGNAL(renameNext( TQListViewItem *, int )),
            this, TQT_SLOT(slotRenameNextItem( TQListViewItem*, int)) );
   connect( this, TQT_SIGNAL(renamePrev( TQListViewItem *, int )),
            this, TQT_SLOT(slotRenamePrevItem( TQListViewItem*, int)) );
   connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );

   connect( horizontalScrollBar(), TQT_SIGNAL(valueChanged( int )),

   setFocus();
}

void KonqBaseListViewWidget::slotRenameNextItem(TQListViewItem *item, int)
{
  TQListViewItem *nextItem = item->itemBelow();
  if (!nextItem)
  {
    nextItem=this->firstChild();
    if (!nextItem)
      return;   
  }

  setCurrentItem(nextItem);
  ListViewBrowserExtension *lvbe = dynamic_cast<ListViewBrowserExtension*>(m_pBrowserView->m_extension);
  if (lvbe)
    lvbe->rename();
}

void KonqBaseListViewWidget::slotRenamePrevItem(TQListViewItem *item, int)
{
  TQListViewItem *prevItem = item->itemAbove();
  if (!prevItem)
  {
    prevItem=this->lastItem();
    if (!prevItem)
      return;
  }

  setCurrentItem(prevItem);
  ListViewBrowserExtension *lvbe = dynamic_cast<ListViewBrowserExtension*>(m_pBrowserView->m_extension);
  if (lvbe)
    lvbe->rename();
}

void KonqBaseListViewWidget::reportItemCounts()
{
   KFileItemList lst = selectedFileItems();


void KonqBaseListViewWidget::slotPopupMenu( TQListViewItem *i, const TQPoint &point, int c )
{
  kdDebug(1202) << "KonqBaseListViewWidget::slotPopupMenu" << endl;
  popupMenu( point, ( i != 0 && c == -1 ) ); // i != 0 && c == -1 when activated by keyboard
}

void KonqBaseListViewWidget::popupMenu( const TQPoint& _global, bool alwaysForSelectedFiles )

Lines 158-163 Link Here

(-)ori/tdebase/konqueror/listview/konq_listviewwidget.h (+2 lines)
158	void slotMouseButtonClicked2( int _button, TQListViewItem *_item, const TQPoint& pos, int );	158	void slotMouseButtonClicked2( int _button, TQListViewItem *_item, const TQPoint& pos, int );
159	virtual void slotExecuted( TQListViewItem *_item );	159	virtual void slotExecuted( TQListViewItem *_item );
160	void slotItemRenamed( TQListViewItem *, const TQString &, int );	160	void slotItemRenamed( TQListViewItem *, const TQString &, int );
		161	void slotRenameNextItem(TQListViewItem *item, int col);
		162	void slotRenamePrevItem(TQListViewItem *item, int col);
161		163
162	protected slots:	164	protected slots:
163	void slotAutoScroll();	165	void slotAutoScroll();

Return to bug 1677

Lines 125-141 Link Here

(-)ori/tdebase/konqueror/listview/konq_listviewwidget.cc (-5 / +40 lines)
125	#endif	125	#endif
126	connect( this, TQT_SIGNAL(returnPressed( TQListViewItem * )),	126	connect( this, TQT_SIGNAL(returnPressed( TQListViewItem * )),
127	this, TQT_SLOT(slotReturnPressed( TQListViewItem * )) );	127	this, TQT_SLOT(slotReturnPressed( TQListViewItem * )) );
128	connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )),	128	connect( this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )),
129	this, TQT_SLOT( slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) );	129	this, TQT_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) );
130	connect( this, TQT_SIGNAL(executed( TQListViewItem * )),	130	connect( this, TQT_SIGNAL(executed( TQListViewItem * )),
131	this, TQT_SLOT(slotExecuted( TQListViewItem * )) );	131	this, TQT_SLOT(slotExecuted( TQListViewItem * )) );
132
133	connect( this, TQT_SIGNAL(currentChanged( TQListViewItem * )),	132	connect( this, TQT_SIGNAL(currentChanged( TQListViewItem * )),
134	this, TQT_SLOT(slotCurrentChanged( TQListViewItem * )) );	133	this, TQT_SLOT(slotCurrentChanged( TQListViewItem * )) );
135	connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )),	134	connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )),
136	this, TQT_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) );	135	this, TQT_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) );
137	connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )),	136	connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )),
138	this, TQT_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) );	137	this, TQT_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) );
		138	connect( this, TQT_SIGNAL(renameNext( TQListViewItem *, int )),
		139	this, TQT_SLOT(slotRenameNextItem( TQListViewItem*, int)) );
		140	connect( this, TQT_SIGNAL(renamePrev( TQListViewItem *, int )),
		141	this, TQT_SLOT(slotRenamePrevItem( TQListViewItem*, int)) );
139	connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );	142	connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) );
140		143
141	connect( horizontalScrollBar(), TQT_SIGNAL(valueChanged( int )),	144	connect( horizontalScrollBar(), TQT_SIGNAL(valueChanged( int )),
Lines 878-883 Link Here
878	setFocus();	881	setFocus();
879	}	882	}
880		883
		884	void KonqBaseListViewWidget::slotRenameNextItem(TQListViewItem *item, int)
		885	{
		886	TQListViewItem *nextItem = item->itemBelow();
		887	if (!nextItem)
		888	{
		889	nextItem=this->firstChild();
		890	if (!nextItem)
		891	return;
		892	}
		893
		894	setCurrentItem(nextItem);
		895	ListViewBrowserExtension lvbe = dynamic_cast<ListViewBrowserExtension>(m_pBrowserView->m_extension);
		896	if (lvbe)
		897	lvbe->rename();
		898	}
		899
		900	void KonqBaseListViewWidget::slotRenamePrevItem(TQListViewItem *item, int)
		901	{
		902	TQListViewItem *prevItem = item->itemAbove();
		903	if (!prevItem)
		904	{
		905	prevItem=this->lastItem();
		906	if (!prevItem)
		907	return;
		908	}
		909
		910	setCurrentItem(prevItem);
		911	ListViewBrowserExtension lvbe = dynamic_cast<ListViewBrowserExtension>(m_pBrowserView->m_extension);
		912	if (lvbe)
		913	lvbe->rename();
		914	}
		915
881	void KonqBaseListViewWidget::reportItemCounts()	916	void KonqBaseListViewWidget::reportItemCounts()
882	{	917	{
883	KFileItemList lst = selectedFileItems();	918	KFileItemList lst = selectedFileItems();
Lines 1025-1032 Link Here
1025		1060
1026	void KonqBaseListViewWidget::slotPopupMenu( TQListViewItem *i, const TQPoint &point, int c )	1061	void KonqBaseListViewWidget::slotPopupMenu( TQListViewItem *i, const TQPoint &point, int c )
1027	{	1062	{
1028	kdDebug(1202) << "KonqBaseListViewWidget::slotPopupMenu" << endl;	1063	kdDebug(1202) << "KonqBaseListViewWidget::slotPopupMenu" << endl;
1029	popupMenu( point, ( i != 0 && c == -1 ) ); // i != 0 && c == -1 when activated by keyboard	1064	popupMenu( point, ( i != 0 && c == -1 ) ); // i != 0 && c == -1 when activated by keyboard
1030	}	1065	}
1031		1066
1032	void KonqBaseListViewWidget::popupMenu( const TQPoint& _global, bool alwaysForSelectedFiles )	1067	void KonqBaseListViewWidget::popupMenu( const TQPoint& _global, bool alwaysForSelectedFiles )