You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
168 lines
5.2 KiB
168 lines
5.2 KiB
12 years ago
|
commit 46a657f7108284d4f02107d11fa407cbf95b86b9
|
||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||
|
Date: 1337058308 -0500
|
||
|
|
||
|
Add the ability to reorder documents in kate
|
||
|
|
||
|
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
|
||
|
index 8d34c38..bc5b0a1 100644
|
||
|
--- a/kate/app/katefilelist.cpp
|
||
|
+++ b/kate/app/katefilelist.cpp
|
||
|
@@ -138,8 +138,14 @@ void KateFileList::setupActions ()
|
||
|
windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection());
|
||
|
sortAction = new KSelectAction( i18n("Sort &By"), 0,
|
||
|
m_main->actionCollection(), "filelist_sortby" );
|
||
|
+ listMoveFileUp = new KAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" );
|
||
|
+ listMoveFileUp->setShortcut(KShortcut(CTRL + SHIFT + Key_Comma));
|
||
|
+ listMoveFileDown = new KAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" );
|
||
|
+ listMoveFileDown->setShortcut(KShortcut(CTRL + SHIFT + Key_Period));
|
||
|
+ connect( listMoveFileUp, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileUp()) );
|
||
|
+ connect( listMoveFileDown, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileDown()) );
|
||
|
TQStringList l;
|
||
|
- l << i18n("Opening Order") << i18n("Document Name") << i18n("URL");
|
||
|
+ l << i18n("Opening Order") << i18n("Document Name") << i18n("URL") << i18n("Manual Placement");
|
||
|
sortAction->setItems( l );
|
||
|
connect( sortAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setSortType(int)) );
|
||
|
}
|
||
|
@@ -353,10 +359,25 @@ void KateFileList::slotMenu ( TQListViewItem *item, const TQPoint &p, int /*col*
|
||
|
if (!item)
|
||
|
return;
|
||
|
|
||
|
+ m_clickedMenuItem = item;
|
||
|
+ if (m_clickedMenuItem->itemAbove()) {
|
||
|
+ listMoveFileUp->setEnabled(true);
|
||
|
+ }
|
||
|
+ else {
|
||
|
+ listMoveFileUp->setEnabled(false);
|
||
|
+ }
|
||
|
+ if (m_clickedMenuItem->itemBelow()) {
|
||
|
+ listMoveFileDown->setEnabled(true);
|
||
|
+ }
|
||
|
+ else {
|
||
|
+ listMoveFileDown->setEnabled(false);
|
||
|
+ }
|
||
|
+
|
||
|
TQPopupMenu *menu = (TQPopupMenu*) ((viewManager->mainWindow())->factory()->container("filelist_popup", viewManager->mainWindow()));
|
||
|
|
||
|
- if (menu)
|
||
|
+ if (menu) {
|
||
|
menu->exec(p);
|
||
|
+ }
|
||
|
}
|
||
|
|
||
|
TQString KateFileList::tooltip( TQListViewItem *item, int )
|
||
|
@@ -385,7 +406,45 @@ TQString KateFileList::tooltip( TQListViewItem *item, int )
|
||
|
void KateFileList::setSortType (int s)
|
||
|
{
|
||
|
m_sort = s;
|
||
|
- updateSort ();
|
||
|
+ if (m_sort == KateFileList::sortManual) {
|
||
|
+ setSorting( -1, true );
|
||
|
+ }
|
||
|
+ else {
|
||
|
+ setSorting( 0, true );
|
||
|
+ updateSort ();
|
||
|
+ }
|
||
|
+}
|
||
|
+
|
||
|
+void KateFileList::moveFileUp()
|
||
|
+{
|
||
|
+ if (m_clickedMenuItem) {
|
||
|
+ sortAction->setCurrentItem(KateFileList::sortManual);
|
||
|
+ setSortType(KateFileList::sortManual);
|
||
|
+ TQListViewItem* nitemabove = m_clickedMenuItem->itemAbove();
|
||
|
+ if (nitemabove) {
|
||
|
+ nitemabove = nitemabove->itemAbove();
|
||
|
+ if (nitemabove) {
|
||
|
+ m_clickedMenuItem->moveItem(nitemabove);
|
||
|
+ }
|
||
|
+ else {
|
||
|
+ // Qt made this hard
|
||
|
+ nitemabove = m_clickedMenuItem->itemAbove();
|
||
|
+ nitemabove->moveItem(m_clickedMenuItem);
|
||
|
+ }
|
||
|
+ }
|
||
|
+ }
|
||
|
+}
|
||
|
+
|
||
|
+void KateFileList::moveFileDown()
|
||
|
+{
|
||
|
+ if (m_clickedMenuItem) {
|
||
|
+ sortAction->setCurrentItem(KateFileList::sortManual);
|
||
|
+ setSortType(KateFileList::sortManual);
|
||
|
+ TQListViewItem* nitemabove = m_clickedMenuItem->itemBelow();
|
||
|
+ if (nitemabove) {
|
||
|
+ m_clickedMenuItem->moveItem(nitemabove);
|
||
|
+ }
|
||
|
+ }
|
||
|
}
|
||
|
|
||
|
void KateFileList::updateSort ()
|
||
|
@@ -441,6 +500,11 @@ KateFileListItem::KateFileListItem( TQListView* lv,
|
||
|
m_edithistpos( 0 ),
|
||
|
m_docNumber( _doc->documentNumber() )
|
||
|
{
|
||
|
+ // Move this document to the end of the list where it belongs
|
||
|
+ TQListViewItem* lastitem = lv->lastItem();
|
||
|
+ if (lastitem) {
|
||
|
+ moveItem(lastitem);
|
||
|
+ }
|
||
|
}
|
||
|
|
||
|
KateFileListItem::~KateFileListItem()
|
||
|
diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h
|
||
|
index 176898c..e3504cb 100644
|
||
|
--- a/kate/app/katefilelist.h
|
||
|
+++ b/kate/app/katefilelist.h
|
||
|
@@ -90,7 +90,8 @@ class KateFileList : public KListView
|
||
|
enum sorting {
|
||
|
sortByID = 0,
|
||
|
sortByName = 1,
|
||
|
- sortByURL = 2
|
||
|
+ sortByURL = 2,
|
||
|
+ sortManual = 3
|
||
|
};
|
||
|
|
||
|
TQString tooltip( TQListViewItem *item, int );
|
||
|
@@ -111,6 +112,8 @@ class KateFileList : public KListView
|
||
|
|
||
|
public slots:
|
||
|
void setSortType (int s);
|
||
|
+ void moveFileUp();
|
||
|
+ void moveFileDown();
|
||
|
void slotNextDocument();
|
||
|
void slotPrevDocument();
|
||
|
|
||
|
@@ -151,6 +154,8 @@ class KateFileList : public KListView
|
||
|
KAction* windowNext;
|
||
|
KAction* windowPrev;
|
||
|
KSelectAction* sortAction;
|
||
|
+ KAction* listMoveFileUp;
|
||
|
+ KAction* listMoveFileDown;
|
||
|
|
||
|
TQPtrList<KateFileListItem> m_viewHistory;
|
||
|
TQPtrList<KateFileListItem> m_editHistory;
|
||
|
@@ -158,6 +163,8 @@ class KateFileList : public KListView
|
||
|
TQColor m_viewShade, m_editShade;
|
||
|
bool m_enableBgShading;
|
||
|
|
||
|
+ TQListViewItem *m_clickedMenuItem;
|
||
|
+
|
||
|
class ToolTip *m_tooltip;
|
||
|
};
|
||
|
|
||
|
diff --git a/kate/data/kateui.rc b/kate/data/kateui.rc
|
||
|
index 27df006..6e784e9 100644
|
||
|
--- a/kate/data/kateui.rc
|
||
|
+++ b/kate/data/kateui.rc
|
||
|
@@ -162,6 +162,9 @@
|
||
|
<Action name="file_close"/>
|
||
|
<Action name="file_close_all"/>
|
||
|
<Separator/>
|
||
|
+ <Action name="filelist_move_up"/>
|
||
|
+ <Action name="filelist_move_down"/>
|
||
|
+ <Separator/>
|
||
|
<Action name="filelist_sortby"/>
|
||
|
</Menu>
|
||
|
|