1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
|
diff -ruN app/mainwindow.cpp app/mainwindow.cpp
--- app/mainwindow.cpp 2017-04-03 15:32:04.000000000 +0300
+++ app/mainwindow.cpp 2017-08-03 02:46:49.903250355 +0300
@@ -286,6 +286,12 @@
action->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_T));
connect(action, SIGNAL(triggered()), m_sessionStack, SLOT(addSession()));
+ action = actionCollection()->addAction(QStringLiteral("clone-session"));
+ action->setText(xi18nc("@action", "New Session (Same Working Directory)"));
+ action->setIcon(QIcon(QStringLiteral("tab-duplicate")));
+ action->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_C));
+ connect(action, SIGNAL(triggered()), m_sessionStack, SLOT(addSessionSameWorkingDir()));
+
action = actionCollection()->addAction(QStringLiteral("new-session-two-horizontal"));
action->setText(xi18nc("@action", "Two Terminals, Horizontally"));
action->setIcon(QIcon(QStringLiteral("tab-new")));
diff -ruN app/session.cpp app/session.cpp
--- app/session.cpp 2017-04-03 15:32:04.000000000 +0300
+++ app/session.cpp 2017-08-03 02:46:49.903250355 +0300
@@ -26,7 +26,7 @@
int Session::m_availableSessionId = 0;
-Session::Session(SessionType type, QWidget* parent) : QObject(parent)
+Session::Session(SessionType type, const QString& directory, QWidget* parent) : QObject(parent)
{
m_sessionId = m_availableSessionId;
m_availableSessionId++;
@@ -38,7 +38,7 @@
m_baseSplitter = new Splitter(Qt::Horizontal, parent);
connect(m_baseSplitter, SIGNAL(destroyed()), this, SLOT(prepareShutdown()));
- setupSession(type);
+ setupSession(type, directory);
}
Session::~Session()
@@ -48,13 +48,13 @@
emit destroyed(m_sessionId);
}
-void Session::setupSession(SessionType type)
+void Session::setupSession(SessionType type, const QString& directory)
{
switch (type)
{
case Single:
{
- Terminal* terminal = addTerminal(m_baseSplitter);
+ Terminal* terminal = addTerminal(directory, m_baseSplitter);
setActiveTerminal(terminal->id());
break;
@@ -64,8 +64,8 @@
{
int splitterWidth = m_baseSplitter->width();
- Terminal* terminal = addTerminal(m_baseSplitter);
- addTerminal(m_baseSplitter);
+ Terminal* terminal = addTerminal(directory, m_baseSplitter);
+ addTerminal(directory, m_baseSplitter);
QList<int> newSplitterSizes;
newSplitterSizes << (splitterWidth / 2) << (splitterWidth / 2);
@@ -88,8 +88,8 @@
int splitterHeight = m_baseSplitter->height();
- Terminal* terminal = addTerminal(m_baseSplitter);
- addTerminal(m_baseSplitter);
+ Terminal* terminal = addTerminal(directory, m_baseSplitter);
+ addTerminal(directory, m_baseSplitter);
QList<int> newSplitterSizes;
newSplitterSizes << (splitterHeight / 2) << (splitterHeight / 2);
@@ -119,11 +119,11 @@
Splitter* lowerSplitter = new Splitter(Qt::Horizontal, m_baseSplitter);
connect(lowerSplitter, SIGNAL(destroyed()), this, SLOT(cleanup()));
- Terminal* terminal = addTerminal(upperSplitter);
- addTerminal(upperSplitter);
+ Terminal* terminal = addTerminal(directory, upperSplitter);
+ addTerminal(directory, upperSplitter);
- addTerminal(lowerSplitter);
- addTerminal(lowerSplitter);
+ addTerminal(directory, lowerSplitter);
+ addTerminal(directory, lowerSplitter);
QList<int> newSplitterSizes;
newSplitterSizes << (splitterHeight / 2) << (splitterHeight / 2);
@@ -147,16 +147,16 @@
default:
{
- addTerminal(m_baseSplitter);
+ addTerminal(directory, m_baseSplitter);
break;
}
}
}
-Terminal* Session::addTerminal(QWidget* parent)
+Terminal* Session::addTerminal(const QString& directory, QWidget* parent)
{
- Terminal* terminal = new Terminal(parent);
+ Terminal* terminal = new Terminal(directory, parent);
connect(terminal, SIGNAL(activated(int)), this, SLOT(setActiveTerminal(int)));
connect(terminal, SIGNAL(manuallyActivated(Terminal*)), this, SIGNAL(terminalManuallyActivated(Terminal*)));
connect(terminal, SIGNAL(titleChanged(int,QString)), this, SLOT(setTitle(int,QString)));
@@ -284,7 +284,7 @@
if (splitter->orientation() != orientation)
splitter->setOrientation(orientation);
- terminal = addTerminal(splitter);
+ terminal = addTerminal(terminal->currentWorkingDirectory(), splitter);
QList<int> newSplitterSizes;
newSplitterSizes << (splitterWidth / 2) << (splitterWidth / 2);
@@ -310,7 +310,7 @@
terminal->setSplitter(newSplitter);
- terminal = addTerminal(newSplitter);
+ terminal = addTerminal(terminal->currentWorkingDirectory(), newSplitter);
splitter->setSizes(splitterSizes);
QList<int> newSplitterSizes;
diff -ruN app/session.h app/session.h
--- app/session.h 2017-04-03 15:32:04.000000000 +0300
+++ app/session.h 2017-08-03 02:46:49.903250355 +0300
@@ -41,7 +41,7 @@
enum SessionType { Single, TwoHorizontal, TwoVertical, Quad };
enum GrowthDirection { Up, Right, Down, Left };
- explicit Session(SessionType type = Single, QWidget* parent = 0);
+ explicit Session(SessionType type = Single, const QString& directory = QString(), QWidget* parent = 0);
~Session();
int id() { return m_sessionId; }
@@ -118,9 +118,9 @@
private:
- void setupSession(SessionType type);
+ void setupSession(SessionType type, const QString& directory);
- Terminal* addTerminal(QWidget* parent);
+ Terminal* addTerminal(const QString& directory, QWidget* parent);
int split(Terminal* terminal, Qt::Orientation orientation);
static int m_availableSessionId;
diff -ruN app/sessionstack.cpp app/sessionstack.cpp
--- app/sessionstack.cpp 2017-04-03 15:32:04.000000000 +0300
+++ app/sessionstack.cpp 2017-08-03 02:46:49.903250355 +0300
@@ -24,6 +24,7 @@
#include "settings.h"
#include "terminal.h"
#include "visualeventoverlay.h"
+#include "terminal.h"
#include "config-yakuake.h"
@@ -49,9 +50,9 @@
{
}
-int SessionStack::addSession(Session::SessionType type)
+int SessionStack::addSession(Session::SessionType type, const QString& directory)
{
- Session* session = new Session(type, this);
+ Session* session = new Session(type, directory, this);
connect(session, SIGNAL(titleChanged(int,QString)), this, SIGNAL(titleChanged(int,QString)));
connect(session, SIGNAL(terminalManuallyActivated(Terminal*)), this, SLOT(handleManualTerminalActivation(Terminal*)));
connect(session, SIGNAL(keyboardInputBlocked(Terminal*)), m_visualEventOverlay, SLOT(indicateKeyboardInputBlocked(Terminal*)));
@@ -72,6 +73,18 @@
return session->id();
}
+int SessionStack::addSessionSameWorkingDir()
+{
+ Session* currentSession = m_sessions.value(m_activeSessionId);
+ Terminal* currentTerminal = currentSession ? currentSession->getTerminal(currentSession->activeTerminalId()) : NULL;
+ QString directory;
+
+ if (currentTerminal)
+ directory = currentTerminal->currentWorkingDirectory();
+
+ return addSession(Session::Single, directory);
+}
+
int SessionStack::addSessionTwoHorizontal()
{
return addSession(Session::TwoHorizontal);
diff -ruN app/sessionstack.h app/sessionstack.h
--- app/sessionstack.h 2017-04-03 15:32:04.000000000 +0300
+++ app/sessionstack.h 2017-08-03 02:46:49.903250355 +0300
@@ -54,7 +54,8 @@
public Q_SLOTS:
- Q_SCRIPTABLE int addSession(Session::SessionType type = Session::Single);
+ Q_SCRIPTABLE int addSession(Session::SessionType type = Session::Single, const QString& directory = QString());
+ Q_SCRIPTABLE int addSessionSameWorkingDir();
Q_SCRIPTABLE int addSessionTwoHorizontal();
Q_SCRIPTABLE int addSessionTwoVertical();
Q_SCRIPTABLE int addSessionQuad();
diff -ruN app/terminal.cpp app/terminal.cpp
--- app/terminal.cpp 2017-04-03 15:32:04.000000000 +0300
+++ app/terminal.cpp 2017-08-03 02:50:24.725018007 +0300
@@ -42,7 +42,7 @@
int Terminal::m_availableTerminalId = 0;
-Terminal::Terminal(QWidget* parent) : QObject(parent)
+Terminal::Terminal(const QString& directory, QWidget* parent) : QObject(parent)
{
m_terminalId = m_availableTerminalId;
m_availableTerminalId++;
@@ -86,7 +86,7 @@
disableOffendingPartActions();
m_terminalInterface = qobject_cast<TerminalInterface*>(m_part);
- if (m_terminalInterface) m_terminalInterface->showShellInDir(QDir::homePath());
+ if (m_terminalInterface) m_terminalInterface->showShellInDir(directory.isEmpty() ? QDir::homePath() : directory);
}
else
displayKPartLoadError();
@@ -228,6 +228,11 @@
emit titleChanged(m_terminalId, m_title);
}
+QString Terminal::currentWorkingDirectory() const
+{
+ return m_terminalInterface->currentWorkingDirectory();
+}
+
void Terminal::runCommand(const QString& command)
{
m_terminalInterface->sendInput(command + QStringLiteral("\n"));
diff -ruN app/terminal.h app/terminal.h
--- app/terminal.h 2017-04-03 15:32:04.000000000 +0300
+++ app/terminal.h 2017-08-03 02:46:49.903250355 +0300
@@ -37,13 +37,14 @@
Q_OBJECT
public:
- explicit Terminal(QWidget* parent = 0);
+ explicit Terminal(const QString& directory, QWidget* parent = 0);
~Terminal();
bool eventFilter(QObject* watched, QEvent* event);
int id() { return m_terminalId; }
const QString title() { return m_title; }
+ QString currentWorkingDirectory() const;
QWidget* partWidget() { return m_partWidget; }
QWidget* terminalWidget() { return m_terminalWidget; }
|