Skip to content

Commit 7d83d2b

Browse files
authored
Merge pull request #1 from Lotharla/use-bottom-panel
use-bottom-panel
2 parents 7fbd7e0 + 0742b25 commit 7d83d2b

File tree

4 files changed

+110
-35
lines changed

4 files changed

+110
-35
lines changed

Diff for: sourcecodebrowser/ctags.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def get_tree(self):
135135
if not p in node:
136136
node[p] = {'tag':None, 'children':{}}
137137
node = node[p]
138-
print node
138+
print(node)
139139
node['tag'] = tag
140140
else:
141141
if not parent in self.tree:

Diff for: sourcecodebrowser/data/configure_dialog.ui

+39-15
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Generated with glade 3.22.2 -->
23
<interface>
3-
<!-- interface-requires gtk+ 3.0 -->
4+
<requires lib="gtk+" version="3.0"/>
45
<object class="GtkDialog" id="configure_dialog">
56
<property name="can_focus">False</property>
67
<property name="border_width">5</property>
78
<property name="title" translatable="yes">Source Code Browser</property>
89
<property name="type_hint">dialog</property>
910
<property name="skip_taskbar_hint">True</property>
1011
<property name="skip_pager_hint">True</property>
12+
<child type="titlebar">
13+
<placeholder/>
14+
</child>
1115
<child internal-child="vbox">
1216
<object class="GtkBox" id="dialog-vbox1">
1317
<property name="can_focus">False</property>
@@ -20,10 +24,10 @@
2024
<child>
2125
<object class="GtkButton" id="button1">
2226
<property name="label">gtk-close</property>
27+
<property name="use_action_appearance">False</property>
2328
<property name="visible">True</property>
2429
<property name="can_focus">True</property>
2530
<property name="receives_default">True</property>
26-
<property name="use_action_appearance">False</property>
2731
<property name="use_stock">True</property>
2832
</object>
2933
<packing>
@@ -45,13 +49,32 @@
4549
<property name="visible">True</property>
4650
<property name="can_focus">False</property>
4751
<property name="orientation">vertical</property>
52+
<child>
53+
<object class="GtkCheckButton" id="use_bottom_panel">
54+
<property name="label" translatable="yes">Use _bottom panel</property>
55+
<property name="use_action_appearance">False</property>
56+
<property name="visible">True</property>
57+
<property name="can_focus">True</property>
58+
<property name="receives_default">False</property>
59+
<property name="use_underline">True</property>
60+
<property name="xalign">0</property>
61+
<property name="draw_indicator">True</property>
62+
<signal name="toggled" handler="on_use_bottom_panel_toggled" swapped="no"/>
63+
</object>
64+
<packing>
65+
<property name="expand">False</property>
66+
<property name="fill">True</property>
67+
<property name="padding">6</property>
68+
<property name="position">0</property>
69+
</packing>
70+
</child>
4871
<child>
4972
<object class="GtkCheckButton" id="show_line_numbers">
5073
<property name="label" translatable="yes">Show _line numbers in tree</property>
74+
<property name="use_action_appearance">False</property>
5175
<property name="visible">True</property>
5276
<property name="can_focus">True</property>
5377
<property name="receives_default">False</property>
54-
<property name="use_action_appearance">False</property>
5578
<property name="use_underline">True</property>
5679
<property name="xalign">0</property>
5780
<property name="draw_indicator">True</property>
@@ -67,10 +90,10 @@
6790
<child>
6891
<object class="GtkCheckButton" id="load_remote_files">
6992
<property name="label" translatable="yes">Load symbols from _remote files</property>
93+
<property name="use_action_appearance">False</property>
7094
<property name="visible">True</property>
7195
<property name="can_focus">True</property>
7296
<property name="receives_default">False</property>
73-
<property name="use_action_appearance">False</property>
7497
<property name="use_underline">True</property>
7598
<property name="xalign">0</property>
7699
<property name="draw_indicator">True</property>
@@ -86,10 +109,10 @@
86109
<child>
87110
<object class="GtkCheckButton" id="expand_rows">
88111
<property name="label" translatable="yes">Start with rows _expanded</property>
112+
<property name="use_action_appearance">False</property>
89113
<property name="visible">True</property>
90114
<property name="can_focus">True</property>
91115
<property name="receives_default">False</property>
92-
<property name="use_action_appearance">False</property>
93116
<property name="use_underline">True</property>
94117
<property name="xalign">0</property>
95118
<property name="draw_indicator">True</property>
@@ -105,10 +128,10 @@
105128
<child>
106129
<object class="GtkCheckButton" id="sort_list">
107130
<property name="label" translatable="yes">_Sort list alphabetically</property>
131+
<property name="use_action_appearance">False</property>
108132
<property name="visible">True</property>
109133
<property name="can_focus">True</property>
110134
<property name="receives_default">False</property>
111-
<property name="use_action_appearance">False</property>
112135
<property name="use_underline">True</property>
113136
<property name="xalign">0</property>
114137
<property name="draw_indicator">True</property>
@@ -124,13 +147,15 @@
124147
<child>
125148
<object class="GtkBox" id="box3">
126149
<property name="visible">True</property>
127-
<property name="can_focus">False</property>
150+
<property name="can_focus">True</property>
151+
<property name="hexpand">True</property>
128152
<child>
129153
<object class="GtkLabel" id="label1">
130154
<property name="visible">True</property>
131-
<property name="can_focus">False</property>
132-
<property name="xalign">0</property>
155+
<property name="can_focus">True</property>
156+
<property name="xpad">5</property>
133157
<property name="label" translatable="yes">ctags executable</property>
158+
<property name="xalign">0</property>
134159
</object>
135160
<packing>
136161
<property name="expand">False</property>
@@ -139,18 +164,16 @@
139164
</packing>
140165
</child>
141166
<child>
142-
<object class="GtkEntry" id="ctags_executable">
167+
<object class="GtkFileChooserButton" id="ctags_executable">
143168
<property name="visible">True</property>
144169
<property name="can_focus">True</property>
145-
<property name="invisible_char">●</property>
146-
<property name="text" translatable="yes">ctags</property>
147-
<property name="invisible_char_set">True</property>
148-
<signal name="changed" handler="on_ctags_executable_changed" swapped="no"/>
170+
<property name="hexpand">True</property>
171+
<property name="title" translatable="yes"/>
172+
<signal name="selection-changed" handler="on_ctags_executable_changed" swapped="no"/>
149173
</object>
150174
<packing>
151175
<property name="expand">False</property>
152176
<property name="fill">True</property>
153-
<property name="padding">6</property>
154177
<property name="position">1</property>
155178
</packing>
156179
</child>
@@ -159,6 +182,7 @@
159182
<property name="expand">False</property>
160183
<property name="fill">True</property>
161184
<property name="padding">6</property>
185+
<property name="pack_type">end</property>
162186
<property name="position">4</property>
163187
</packing>
164188
</child>

Diff for: sourcecodebrowser/data/org.gnome.gedit.plugins.sourcecodebrowser.gschema.xml

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<schemalist>
33
<schema id="org.gnome.gedit.plugins.sourcecodebrowser" path="/org/gnome/gedit/plugins/sourcecodebrowser/">
4+
<key type="b" name="use-bottom-panel">
5+
<default>true</default>
6+
<summary>Use bottom panel</summary>
7+
<description>Use the bottom panel for the source tree.</description>
8+
</key>
49
<key type="b" name="show-line-numbers">
510
<default>false</default>
611
<summary>Show Line Numbers</summary>

0 commit comments

Comments
 (0)