TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Kate session panel: added "Sessions" menu support.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/2/head
Michele Calgaro 8 years ago
parent 67642abd94
commit 6131095c14
7 changed files with 169 additions and 57 deletions
Show Stats Download Patch File Download Diff File

99
kate/app/katemainwindow.cpp
Unescape Escape View File

@ -219,7 +219,7 @@ void KateMainWindow::setupMainWindow ()
connect(fileselector->dirOperator(),TQT_SIGNAL(fileSelected(const KFileItem*)),this,TQT_SLOT(fileSelected(const KFileItem*))); connect(fileselector->dirOperator(),TQT_SIGNAL(fileSelected(const KFileItem*)),this,TQT_SLOT(fileSelected(const KFileItem*)));
KateMDI::ToolView *st = createToolView("kate_sessionpanel", KMultiTabBar::Left, SmallIcon("view_choose"), i18n("Sessions")); KateMDI::ToolView *st = createToolView("kate_sessionpanel", KMultiTabBar::Left, SmallIcon("view_choose"), i18n("Sessions"));
sessionpanel = new KateSessionPanel( this, m_viewManager, st, "sessionpanel"); m_sessionpanel = new KateSessionPanel( this, m_viewManager, st, "sessionpanel");
// ONLY ALLOW SHELL ACCESS IF ALLOWED ;) // ONLY ALLOW SHELL ACCESS IF ALLOWED ;)
if (KateApp::self()->authorize("shell_access")) if (KateApp::self()->authorize("shell_access"))
@ -305,17 +305,30 @@ void KateMainWindow::setupActions()
slotWindowActivated (); slotWindowActivated ();
// FIXME to fix and enable again
// session actions // session actions
/* new TDEAction(i18n("Menu entry Session->New", "&New"), "list-add", 0, TQT_TQOBJECT(OldKateSessionManager::self()), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new"); new TDEAction(i18n("&New"), "list-add", 0,
new TDEAction(i18n("&Open..."), "document-open", 0, TQT_TQOBJECT(OldKateSessionManager::self()), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open"); TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotNewSession()), actionCollection(), "session_new");
new TDEAction(i18n("&Save"), "document-save", 0, TQT_TQOBJECT(OldKateSessionManager::self()), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save"); new TDEAction(i18n("&Save"), "document-save", 0,
new TDEAction(i18n("Save &As..."), "document-save-as", 0, TQT_TQOBJECT(OldKateSessionManager::self()), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as"); TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSaveSession()), actionCollection(), "session_save");
new TDEAction(i18n("&Manage..."), "view_choose", 0, TQT_TQOBJECT(OldKateSessionManager::self()), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage"); new TDEAction(i18n("Save &As..."), "document-save-as", 0,
TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSaveSessionAs()), actionCollection(), "session_save_as");
// quick open menu ;) new TDEAction(i18n("&Rename"), "edit_user", 0,
new OldKateSessionsAction (i18n("&Quick Open"), actionCollection(), "sessions_list"); TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotRenameSession()), actionCollection(), "session_rename");
*/ new TDEAction(i18n("&Delete"), "edit-delete", 0,
TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotDeleteSession()), actionCollection(), "session_delete");
new TDEAction(i18n("Re&load"), "reload", 0,
TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotReloadSession()), actionCollection(), "session_reload");
new TDEAction(i18n("Acti&vate"), "forward", 0,
TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotActivateSession()), actionCollection(), "session_activate");
new TDEToggleAction(i18n("Toggle read &only"), "encrypted", 0,
TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSessionToggleReadOnly()), actionCollection(), "session_toggle_read_only");
new TDEAction(i18n("Move &Up"), "go-up", 0,
TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSessionMoveUp()), actionCollection(), "session_move_up");
new TDEAction(i18n("Move Do&wn"), "go-down", 0,
TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSessionMoveDown()), actionCollection(), "session_move_down");
new KateSessionListActionMenu(this, i18n("Sele&ct session"), actionCollection(), "session_list");
connect(m_sessionpanel, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged()));
} }
KateTabWidget *KateMainWindow::tabWidget () KateTabWidget *KateMainWindow::tabWidget ()
@ -857,10 +870,68 @@ void KateMainWindow::readProperties(TDEConfig *config)
config->setGroup(grp); config->setGroup(grp);
} }
void KateMainWindow::saveGlobalProperties( TDEConfig* sessionConfig ) //-------------------------------------------
void KateMainWindow::slotSelectionChanged()
{
TDEActionCollection *mwac = actionCollection(); // Main Window Action Collection
TDEActionPtrList actionList = m_sessionpanel->m_actionCollection->actions();
TDEActionPtrList::ConstIterator spa_it;
for (spa_it = actionList.begin(); spa_it != actionList.end(); ++spa_it)
{
TDEAction *a = mwac->action((*spa_it)->name());
TDEToggleAction *ta = dynamic_cast<TDEToggleAction*>(a);
if (ta)
{
ta->setChecked((dynamic_cast<TDEToggleAction*>(*spa_it))->isChecked());
}
if (a)
{
a->setEnabled((*spa_it)->isEnabled());
}
}
}
//-------------------------------------------
void KateMainWindow::activateSession(int sessionId)
{
if (sessionId < 0 || sessionId == KateApp::self()->sessionManager()->getActiveSessionId())
{
return;
}
// Select the required session in the session panel's listview
TQListViewItem *item = m_sessionpanel->m_listview->firstChild();
int idx = 0;
while (item && idx < sessionId)
{
item = item->nextSibling();
++idx;
}
if (idx == sessionId && item)
{
// Required session item found, switch session with consistent behavior
m_sessionpanel->m_listview->setSelected(item, true);
m_sessionpanel->slotActivateSession();
}
}
//-------------------------------------------
KateSessionListActionMenu::KateSessionListActionMenu(KateMainWindow *mw, const TQString &text, TQObject *parent, const char *name)
: TDEActionMenu(text, parent, name), m_mainWindow(mw)
{ {
// FIXME do we still need this code here? connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShow()));
// KateDocManager::self()->saveDocumentList (sessionConfig); }
//-------------------------------------------
void KateSessionListActionMenu::slotAboutToShow()
{
popupMenu()->clear();
TQPtrList<KateSession> &sessions = KateApp::self()->sessionManager()->getSessionsList();
for (int idx = 0; idx < (int)sessions.count(); ++idx)
{
popupMenu()->insertItem(sessions[idx]->getSessionName(), m_mainWindow, TQT_SLOT(activateSession(int)), 0, idx);
}
} }
// kate: space-indent on; indent-width 2; replace-tabs on; // kate: space-indent on; indent-width 2; replace-tabs on;

50
kate/app/katemainwindow.h
Unescape Escape View File

@ -68,7 +68,6 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
/** /**
* Accessor methodes for interface and child objects * Accessor methodes for interface and child objects
*/ */
public:
Kate::MainWindow *mainWindow () { return m_mainWindow; } Kate::MainWindow *mainWindow () { return m_mainWindow; }
Kate::ToolViewManager *toolViewManager () { return m_toolViewManager; } Kate::ToolViewManager *toolViewManager () { return m_toolViewManager; }
@ -79,7 +78,6 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
/** /**
* various methodes to get some little info out of this * various methodes to get some little info out of this
*/ */
public:
/** Returns the URL of the current document. /** Returns the URL of the current document.
* anders: I add this for use from the file selector. */ * anders: I add this for use from the file selector. */
KURL activeDocumentUrl(); KURL activeDocumentUrl();
@ -101,14 +99,27 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
*/ */
KateTabWidget *tabWidget (); KateTabWidget *tabWidget ();
public:
void readProperties(TDEConfig *config); void readProperties(TDEConfig *config);
void saveProperties(TDEConfig *config); void saveProperties(TDEConfig *config);
void saveGlobalProperties( TDEConfig* sessionConfig );
public:
bool queryClose_internal(); bool queryClose_internal();
void openURL (const TQString &name=0L);
public slots:
/**
* update "Sessions" menu status when selection in session panel has changed
*/
void slotSelectionChanged();
/**
* activate the specified session. When there is the need to activate a session
* from the outside (for example from DCOP), using this method assures that
* the session activation is consistent with the behavior of the session panel
* @param sessionId the id of the session to activate
*/
void activateSession(int sessionId);
private: private:
void setupMainWindow(); void setupMainWindow();
void setupActions(); void setupActions();
@ -127,11 +138,11 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
void dragEnterEvent( TQDragEnterEvent * ); void dragEnterEvent( TQDragEnterEvent * );
void dropEvent( TQDropEvent * ); void dropEvent( TQDropEvent * );
private slots:
/** /**
* slots used for actions in the menus/toolbars * slots used for actions in the menus/toolbars
* or internal signal connections * or internal signal connections
*/ */
private slots:
void newWindow (); void newWindow ();
void slotConfigure(); void slotConfigure();
@ -163,18 +174,12 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
void pluginHelp(); void pluginHelp();
void slotFullScreen(bool); void slotFullScreen(bool);
public:
void openURL (const TQString &name=0L);
private slots:
void updateGrepDir (bool visible); void updateGrepDir (bool visible);
void slotDocumentCloseAll();
protected: protected:
bool event( TQEvent * ); bool event( TQEvent * );
private slots:
void slotDocumentCloseAll();
private: private:
static uint uniqueID; static uint uniqueID;
uint myID; uint myID;
@ -198,7 +203,7 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
KateFileList *filelist; KateFileList *filelist;
KateFileSelector *fileselector; KateFileSelector *fileselector;
KateSessionPanel *sessionpanel; KateSessionPanel *m_sessionpanel;
TDEActionMenu* documentOpenWith; TDEActionMenu* documentOpenWith;
@ -214,6 +219,21 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
KateTabWidget *m_tabWidget; KateTabWidget *m_tabWidget;
}; };
class KateSessionListActionMenu : public TDEActionMenu
{
Q_OBJECT
public:
KateSessionListActionMenu(KateMainWindow *mw, const TQString &text, TQObject *parent = NULL, const char *name = NULL);
~KateSessionListActionMenu() {}
public slots:
void slotAboutToShow();
protected:
KateMainWindow *m_mainWindow;
};
#endif #endif
// kate: space-indent on; indent-width 2; replace-tabs on; // kate: space-indent on; indent-width 2; replace-tabs on;

2
kate/app/katesession.cpp
Unescape Escape View File

@ -852,7 +852,7 @@ KateSessionChooser::KateSessionChooser(TQWidget *parent)
connect (m_listview, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); connect (m_listview, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
connect (m_listview, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotUser2())); connect (m_listview, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotUser2()));
TQPtrList<KateSession>& sessions = KateSessionManager::self()->getSessionsList(); TQPtrList<KateSession> &sessions = KateSessionManager::self()->getSessionsList();
for (int idx = sessions.count()-1; idx >= 0; --idx) for (int idx = sessions.count()-1; idx >= 0; --idx)
{ {
new KateSessionChooserItem(m_listview, sessions[idx]->getSessionName(), new KateSessionChooserItem(m_listview, sessions[idx]->getSessionName(),

5
kate/app/katesession.h
Unescape Escape View File

@ -244,6 +244,11 @@ class KateSessionManager : public TQObject
*/ */
const TQString& getBaseDir() const { return m_baseDir; } const TQString& getBaseDir() const { return m_baseDir; }
/**
* @return the number of existing sessions
*/
int getSessionCount() const { return m_sessions.count(); }
/** /**
* @return the active session id * @return the active session id
*/ */

33
kate/app/katesessionpanel.cpp
Unescape Escape View File

@ -126,9 +126,8 @@ void KateSessionPanelToolBarParent::resizeEvent (TQResizeEvent*)
//------------------------------------------- //-------------------------------------------
KateSessionPanel::KateSessionPanel(KateMainWindow *mainWindow, KateViewManager *viewManager, KateSessionPanel::KateSessionPanel(KateMainWindow *mainWindow, KateViewManager *viewManager,
TQWidget *parent, const char *name) TQWidget *parent, const char *name)
: TQVBox(parent, name), m_mainWin(mainWindow), m_viewManager(viewManager), : TQVBox(parent, name), m_sessionManager(KateSessionManager::self()),
m_sessionManager(KateSessionManager::self()), m_actionCollection(new TDEActionCollection(this)), m_actionCollection(new TDEActionCollection(this)), m_columnName(-1), m_columnPixmap(-1)
m_columnName(-1), m_columnPixmap(-1)
{ {
// Toolbar // Toolbar
setup_toolbar(); setup_toolbar();
@ -171,7 +170,7 @@ KateSessionPanel::KateSessionPanel(KateMainWindow *mainWindow, KateViewManager *
this, TQT_SLOT(slotLVSessionRenamed(TQListViewItem*))); this, TQT_SLOT(slotLVSessionRenamed(TQListViewItem*)));
TQPtrList<KateSession>& sessions = m_sessionManager->getSessionsList(); TQPtrList<KateSession>& sessions = m_sessionManager->getSessionsList();
for (int idx = sessions.count()-1; idx >= 0; --idx) for (int idx = sessions.count() - 1; idx >= 0; --idx)
{ {
new KateSessionPanelItem(m_listview, sessions[idx]->getSessionName(), idx); new KateSessionPanelItem(m_listview, sessions[idx]->getSessionName(), idx);
if (idx == m_sessionManager->getActiveSessionId()) if (idx == m_sessionManager->getActiveSessionId())
@ -444,14 +443,17 @@ void KateSessionPanel::slotActivateSession()
void KateSessionPanel::slotSessionToggleReadOnly() void KateSessionPanel::slotSessionToggleReadOnly()
{ {
KateSessionPanelItem *sessionItem = dynamic_cast<KateSessionPanelItem*>(m_listview->selectedItem()); KateSessionPanelItem *sessionItem = dynamic_cast<KateSessionPanelItem*>(m_listview->selectedItem());
if (!sessionItem) const KateSession *ks(NULL);
if (sessionItem)
{
ks = m_sessionManager->getSessionFromId(sessionItem->getSessionId());
}
if (!sessionItem || !ks)
{ {
return; return;
} }
m_sessionManager->setSessionReadOnlyStatus(sessionItem->getSessionId(), m_sessionManager->setSessionReadOnlyStatus(sessionItem->getSessionId(), !ks->isReadOnly());
(dynamic_cast<TDEToggleAction*>(
m_actionCollection->action("session_toggle_read_only")))->isChecked());
slotSelectionChanged(); // Update the toolbar button status slotSelectionChanged(); // Update the toolbar button status
} }
@ -549,13 +551,16 @@ void KateSessionPanel::slotSelectionChanged()
readOnlyAction->setEnabled(true); readOnlyAction->setEnabled(true);
readOnlyAction->setChecked(ks->isReadOnly()); readOnlyAction->setChecked(ks->isReadOnly());
} }
int sessId = sessionItem->getSessionId();
int activeSessId = m_sessionManager->getActiveSessionId();
m_actionCollection->action("session_save_as")->setEnabled(true); m_actionCollection->action("session_save_as")->setEnabled(true);
m_actionCollection->action("session_reload")->setEnabled( m_actionCollection->action("session_reload")->setEnabled(sessId == activeSessId);
sessionItem->getSessionId() == m_sessionManager->getActiveSessionId()); m_actionCollection->action("session_activate")->setEnabled(sessId != activeSessId);
m_actionCollection->action("session_activate")->setEnabled(true); m_actionCollection->action("session_move_up")->setEnabled(sessId > 0);
m_actionCollection->action("session_move_up")->setEnabled(true); m_actionCollection->action("session_move_down")->setEnabled(sessId < (m_sessionManager->getSessionCount() - 1));
m_actionCollection->action("session_move_down")->setEnabled(true);
} }
emit selectionChanged();
} }
//------------------------------------------- //-------------------------------------------

14
kate/app/katesessionpanel.h
Unescape Escape View File

@ -111,13 +111,21 @@ class KateSessionPanel : public TQVBox
{ {
Q_OBJECT Q_OBJECT
friend class KateMainWindow;
public: public:
KateSessionPanel(KateMainWindow *mainWindow=0, KateViewManager *viewManager=0, KateSessionPanel(KateMainWindow *mainWindow=0, KateViewManager *viewManager=0,
TQWidget *parent=0, const char *name=0); TQWidget *parent=0, const char *name=0);
~KateSessionPanel() {} ~KateSessionPanel() {}
signals:
/**
* Emitted when the session selection in the panel has changed
*/
void selectionChanged();
public slots: public slots:
void slotNewSession(); void slotNewSession();
void slotSaveSession(); void slotSaveSession();
@ -131,7 +139,7 @@ class KateSessionPanel : public TQVBox
void slotSessionMoveDown(); void slotSessionMoveDown();
void slotItemExecuted(TQListViewItem *item); void slotItemExecuted(TQListViewItem *item);
void slotSelectionChanged(); void slotSelectionChanged(); /** @emit selectionChanged */
void slotSessionActivated(int newSessionId, int oldSessionId); void slotSessionActivated(int newSessionId, int oldSessionId);
void slotSessionCreated(int sessionId); void slotSessionCreated(int sessionId);
void slotSessionDeleted(int sessionId); void slotSessionDeleted(int sessionId);
@ -153,8 +161,6 @@ class KateSessionPanel : public TQVBox
*/ */
int handleSessionSwitch(); int handleSessionSwitch();
KateMainWindow *m_mainWin;
KateViewManager *m_viewManager;
KateSessionManager *m_sessionManager; KateSessionManager *m_sessionManager;
TDEActionCollection *m_actionCollection; TDEActionCollection *m_actionCollection;
TDEToolBar *m_toolbar; TDEToolBar *m_toolbar;

23
kate/data/kateui.rc
Unescape Escape View File

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="kate" version="49"> <kpartgui name="kate" version="50">
<MenuBar noMerge="1"> <MenuBar noMerge="1">
<Menu name="file"><text>&amp;File</text> <Menu name="file"><text>&amp;File</text>
@ -60,14 +60,19 @@
</Menu> </Menu>
<Menu name="sessions"><text>Sess&amp;ions</text> <Menu name="sessions"><text>Sess&amp;ions</text>
<Action name="sessions_new"/> <Action name="session_list"/>
<Action name="sessions_open"/> <Separator/>
<Action name="sessions_list"/> <Action name="session_new"/>
<Separator /> <Action name="session_save"/>
<Action name="sessions_save"/> <Action name="session_save_as"/>
<Action name="sessions_save_as"/> <Action name="session_rename"/>
<Separator /> <Action name="session_delete"/>
<Action name="sessions_manage"/> <Action name="session_reload"/>
<Separator/>
<Action name="session_activate"/>
<Action name="session_toggle_read_only"/>
<Action name="session_move_up"/>
<Action name="session_move_down"/>
</Menu> </Menu>
<Menu name="settings"><text>&amp;Settings</text> <Menu name="settings"><text>&amp;Settings</text>

Write Preview
Loading…
Cancel
Save