2
committer: Matthieu Baerts <matttbe@gmail.com>
3
branch nick: cairo-dock-plug-ins
4
timestamp: Sat 2013-11-30 18:57:54 +0100
5
message: Terminal: middle click: launch the default terminal
6
The previous function was useless (hide the dialogue) because if the dialogue is displayed, it has the focus: we can't do a middle click on the icon
8
=== modified file 'terminal/src/terminal-menu-functions.c'
9
Index: cairo-dock-plug-ins/terminal/src/terminal-menu-functions.c
10
===================================================================
11
--- cairo-dock-plug-ins.orig/terminal/src/terminal-menu-functions.c 2014-04-06 22:33:07.983528641 +0200
12
+++ cairo-dock-plug-ins/terminal/src/terminal-menu-functions.c 2014-04-06 22:33:07.979528641 +0200
15
CD_APPLET_ON_MIDDLE_CLICK_BEGIN
20
- gldi_dialog_hide (myData.dialog);
22
+ if (myConfig.cTerminal != NULL)
23
+ cairo_dock_launch_command (myConfig.cTerminal);
25
+ cairo_dock_launch_command (cairo_dock_get_default_terminal ());
27
CD_APPLET_ON_MIDDLE_CLICK_END
29
Index: cairo-dock-plug-ins/terminal/data/terminal.conf.in
30
===================================================================
31
--- cairo-dock-plug-ins.orig/terminal/data/terminal.conf.in 2014-04-06 22:33:07.983528641 +0200
32
+++ cairo-dock-plug-ins/terminal/data/terminal.conf.in 2014-04-06 22:33:07.975528642 +0200
35
#k Shortkey to show the terminal:
36
shortkey = <Control>F5
38
+#s[Default] Open this terminal when doing a middle click on the icon:
39
+#{The default terminal is defined by the COLORTERM environment variable}
41
Index: cairo-dock-plug-ins/terminal/src/terminal-config.c
42
===================================================================
43
--- cairo-dock-plug-ins.orig/terminal/src/terminal-config.c 2014-04-06 22:33:07.983528641 +0200
44
+++ cairo-dock-plug-ins/terminal/src/terminal-config.c 2014-04-06 22:33:07.979528641 +0200
46
myConfig.shortcut = CD_CONFIG_GET_STRING_WITH_DEFAULT ("Configuration", "shortkey", "<Ctrl>F1");
47
myConfig.iNbRows = CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "nb lines", 25);
48
myConfig.iNbColumns = CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "nb columns", 80);
49
+ myConfig.cTerminal = CD_CONFIG_GET_STRING ("Configuration", "terminal app");
50
CD_APPLET_GET_CONFIG_END
54
g_free (myConfig.shortcut);
55
myConfig.shortcut = NULL;
56
g_free (myConfig.cCustomFont);
57
+ g_free (myConfig.cTerminal);
58
CD_APPLET_RESET_CONFIG_END
61
Index: cairo-dock-plug-ins/terminal/src/terminal-struct.h
62
===================================================================
63
--- cairo-dock-plug-ins.orig/terminal/src/terminal-struct.h 2014-04-06 22:33:07.983528641 +0200
64
+++ cairo-dock-plug-ins/terminal/src/terminal-struct.h 2014-04-06 22:33:07.979528641 +0200