/b-gtk/fix-viz : revision 734.1.14

8

__author__ = "Scott James Remnant <scott@ubuntu.com>"

9

10

11

from gi.repository import Gdk

12

11

from gi.repository import Gtk

13

12

14

13

from bzrlib.plugins.gtk import icon_path

68

67

self._save_size_on_destroy(self, 'viz-window-size')

69

68

70

69

# FIXME AndyFitz!

71

icon = self.render_icon_pixbuf(Gtk.STOCK_INDEX, Gtk.IconSize.BUTTON)

70

icon = self.render_icon(Gtk.STOCK_INDEX, Gtk.IconSize.BUTTON)

72

71

self.set_icon(icon)

73

72

74

73

Gtk.AccelMap.add_entry("<viz>/Go/Next Revision", Gdk.KEY_Up, Gdk.ModifierType.MOD1_MASK)

123

122

nav = self.construct_navigation()

124

123

menubar = self.construct_menubar()

125

124

126

vbox.pack_start(menubar, False, True, 0)

127

vbox.pack_start(nav, False, True, 0)

128

vbox.pack_start(paned, True, True, 0)

125

vbox.pack_start(menubar, False, True, True, 0)

126

vbox.pack_start(nav, False, True,True, 0)

127

vbox.pack_start(paned, True, True, True, 0)

129

128

vbox.set_focus_child(paned)

130

129

131

130

150

149

menubar = Gtk.MenuBar()

151

150

152

151

file_menu = Gtk.Menu()

153

file_menuitem = Gtk.MenuItem.new_with_mnemonic("_File")

152

file_menuitem = Gtk.MenuItem("_File")

154

153

file_menuitem.set_submenu(file_menu)

155

154

156

file_menu_close = Gtk.ImageMenuItem.new_from_stock(

157

Gtk.STOCK_CLOSE, self.accel_group)

155

file_menu_close = Gtk.ImageMenuItem(Gtk.STOCK_CLOSE, self.accel_group)

158

156

file_menu_close.connect('activate', lambda x: self.destroy())

159

157

160

file_menu_quit = Gtk.ImageMenuItem.new_from_stock(

161

Gtk.STOCK_QUIT, self.accel_group)

158

file_menu_quit = Gtk.ImageMenuItem(Gtk.STOCK_QUIT, self.accel_group)

162

159

file_menu_quit.connect('activate', lambda x: Gtk.main_quit())

163

160

164

161

if self._parent is not None:

166

163

file_menu.add(file_menu_quit)

167

164

168

165

edit_menu = Gtk.Menu()

169

edit_menuitem = Gtk.MenuItem.new_with_mnemonic("_Edit")

166

edit_menuitem = Gtk.MenuItem("_Edit")

170

167

edit_menuitem.set_submenu(edit_menu)

171

168

172

edit_menu_branchopts = Gtk.MenuItem(label="Branch Settings")

169

edit_menu_branchopts = Gtk.MenuItem("Branch Settings")

173

170

edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())

174

171

175

edit_menu_globopts = Gtk.MenuItem(label="Global Settings")

172

edit_menu_globopts = Gtk.MenuItem("Global Settings")

176

173

edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())

177

174

178

175

edit_menu.add(edit_menu_branchopts)

179

176

edit_menu.add(edit_menu_globopts)

180

177

181

178

view_menu = Gtk.Menu()

182

view_menuitem = Gtk.MenuItem.new_with_mnemonic("_View")

179

view_menuitem = Gtk.MenuItem("_View")

183

180

view_menuitem.set_submenu(view_menu)

184

181

185

182

view_menu_refresh = self.refresh_action.create_menu_item()

188

185

view_menu.add(view_menu_refresh)

189

186

view_menu.add(Gtk.SeparatorMenuItem())

190

187

191

view_menu_toolbar = Gtk.CheckMenuItem(label="Show Toolbar")

188

view_menu_toolbar = Gtk.CheckMenuItem("Show Toolbar")

192

189

view_menu_toolbar.set_active(True)

193

190

if self.config.get_user_option('viz-toolbar-visible') == 'False':

194

191

view_menu_toolbar.set_active(False)

195

192

self.toolbar.hide()

196

193

view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)

197

194

198

view_menu_compact = Gtk.CheckMenuItem(label="Show Compact Graph")

195

view_menu_compact = Gtk.CheckMenuItem("Show Compact Graph")

199

196

view_menu_compact.set_active(self.compact_view)

200

197

view_menu_compact.connect('activate', self._brokenlines_toggled_cb)

201

198

202

view_menu_vertical = Gtk.CheckMenuItem(label="Side-by-side Layout")

199

view_menu_vertical = Gtk.CheckMenuItem("Side-by-side Layout")

203

200

view_menu_vertical.set_active(False)

204

201

if self.config.get_user_option('viz-vertical') == 'True':

205

202

view_menu_vertical.set_active(True)

206

203

view_menu_vertical.connect('toggled', self._vertical_layout)

207

204

208

view_menu_diffs = Gtk.CheckMenuItem(label="Show Diffs")

205

view_menu_diffs = Gtk.CheckMenuItem("Show Diffs")

209

206

view_menu_diffs.set_active(False)

210

207

if self.config.get_user_option('viz-show-diffs') == 'True':

211

208

view_menu_diffs.set_active(True)

212

209

view_menu_diffs.connect('toggled', self._diff_visibility_changed)

213

210

214

view_menu_wide_diffs = Gtk.CheckMenuItem(label="Wide Diffs")

211

view_menu_wide_diffs = Gtk.CheckMenuItem("Wide Diffs")

215

212

view_menu_wide_diffs.set_active(False)

216

213

if self.config.get_user_option('viz-wide-diffs') == 'True':

217

214

view_menu_wide_diffs.set_active(True)

218

215

view_menu_wide_diffs.connect('toggled', self._diff_placement_changed)

219

216

220

view_menu_wrap_diffs = Gtk.CheckMenuItem.new_with_mnemonic(

221

"Wrap _Long Lines in Diffs")

217

view_menu_wrap_diffs = Gtk.CheckMenuItem("Wrap _Long Lines in Diffs")

222

218

view_menu_wrap_diffs.set_active(False)

223

219

if self.config.get_user_option('viz-wrap-diffs') == 'True':

224

220

view_menu_wrap_diffs.set_active(True)

233

229

view_menu.add(view_menu_wrap_diffs)

234

230

view_menu.add(Gtk.SeparatorMenuItem())

235

231

236

self.mnu_show_revno_column = Gtk.CheckMenuItem.new_with_mnemonic(

237

"Show Revision _Number Column")

238

self.mnu_show_date_column = Gtk.CheckMenuItem.new_with_mnemonic(

239

"Show _Date Column")

232

self.mnu_show_revno_column = Gtk.CheckMenuItem("Show Revision _Number Column")

233

self.mnu_show_date_column = Gtk.CheckMenuItem("Show _Date Column")

240

234

241

235

# Revision numbers are pointless if there are multiple branches

242

236

if len(self.start_revs) > 1:

251

245

252

246

go_menu = Gtk.Menu()

253

247

go_menu.set_accel_group(self.accel_group)

254

go_menuitem = Gtk.MenuItem.new_with_mnemonic("_Go")

248

go_menuitem = Gtk.MenuItem("_Go")

255

249

go_menuitem.set_submenu(go_menu)

256

250

257

251

go_menu_next = self.next_rev_action.create_menu_item()

259

253

260

254

tag_image = Gtk.Image()

261

255

tag_image.set_from_file(icon_path("tag-16.png"))

262

self.go_menu_tags = Gtk.ImageMenuItem.new_with_mnemonic("_Tags")

256

self.go_menu_tags = Gtk.ImageMenuItem("_Tags")

263

257

self.go_menu_tags.set_image(tag_image)

264

258

self.treeview.connect('refreshed', lambda w: self._update_tags())

265

259

270

264

271

265

self.revision_menu = RevisionMenu(self.branch.repository, [],

272

266

self.branch, parent=self)

273

revision_menuitem = Gtk.MenuItem.new_with_mnemonic("_Revision")

267

revision_menuitem = Gtk.MenuItem("_Revision")

274

268

revision_menuitem.set_submenu(self.revision_menu)

275

269

276

270

branch_menu = Gtk.Menu()

277

branch_menuitem = Gtk.MenuItem.new_with_mnemonic("_Branch")

271

branch_menuitem = Gtk.MenuItem("_Branch")

278

272

branch_menuitem.set_submenu(branch_menu)

279

273

280

branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_ll Revisions"))

281

branch_menu.add(Gtk.MenuItem.new_with_mnemonic("Pu_sh Revisions"))

274

branch_menu.add(Gtk.MenuItem("Pu_ll Revisions"))

275

branch_menu.add(Gtk.MenuItem("Pu_sh Revisions"))

282

276

283

277

try:

284

278

from bzrlib.plugins import search

287

281

else:

288

282

branch_menu.add(Gtk.SeparatorMenuItem())

289

283

290

branch_index_menuitem = Gtk.MenuItem.new_with_mnemonic("_Index")

284

branch_index_menuitem = Gtk.MenuItem("_Index")

291

285

branch_index_menuitem.connect('activate', self._branch_index_cb)

292

286

branch_menu.add(branch_index_menuitem)

293

287

294

branch_search_menuitem = Gtk.MenuItem.new_with_mnemonic("_Search")

288

branch_search_menuitem = Gtk.MenuItem("_Search")

295

289

branch_search_menuitem.connect('activate', self._branch_search_cb)

296

290

branch_menu.add(branch_search_menuitem)

297

291

298

292

help_menu = Gtk.Menu()

299

help_menuitem = Gtk.MenuItem.new_with_mnemonic("_Help")

293

help_menuitem = Gtk.MenuItem("_Help")

300

294

help_menuitem.set_submenu(help_menu)

301

295

302

help_about_menuitem = Gtk.ImageMenuItem.new_from_stock(

303

Gtk.STOCK_ABOUT, self.accel_group)

296

help_about_menuitem = Gtk.ImageMenuItem(Gtk.STOCK_ABOUT,

297

self.accel_group)

304

298

help_about_menuitem.connect('activate', self._about_dialog_cb)

305

299

306

300

help_menu.add(help_about_menuitem)

352

346

def construct_navigation(self):

353

347

"""Construct the navigation buttons."""

354

348

self.toolbar = Gtk.Toolbar()

355

self.toolbar.set_style(Gtk.ToolbarStyle.BOTH_HORIZ)

349

self.toolbar.set_style(Gtk.TOOLBAR_BOTH_HORIZ)

356

350

357

351

self.prev_button = self.prev_rev_action.create_tool_item()

358

352

self.toolbar.insert(self.prev_button, -1)

362

356

363

357

self.toolbar.insert(Gtk.SeparatorToolItem(), -1)

364

358

365

refresh_button = Gtk.ToolButton.new_from_stock(Gtk.STOCK_REFRESH)

359

refresh_button = Gtk.ToolButton(Gtk.STOCK_REFRESH)

366

360

refresh_button.connect('clicked', self._refresh_clicked)

367

361

self.toolbar.insert(refresh_button, -1)

368

362

568

562

old = self.paned

569

563

self.vbox.remove(old)

570

564

self.vbox.pack_start(

571

self.construct_paned(), True, True, True, 0)

565

self.construct_paned(, True, True, 0), True, True, True, 0)

572

566

self._make_diff_paned_nonzero_size()

573

567

self._make_diff_nonzero_size()

574

568

626

620

for tag, revid in tags:

627

621

tag_image = Gtk.Image()

628

622

tag_image.set_from_file(icon_path('tag-16.png'))

629

tag_item = Gtk.ImageMenuItem.new_with_mnemonic(

630

tag.replace('_', '__'))

623

tag_item = Gtk.ImageMenuItem(tag.replace('_', '__'))

631

624

tag_item.set_image(tag_image)

632

625

tag_item.connect('activate', self._tag_selected_cb, revid)

633

626

tag_item.set_sensitive(self.treeview.has_revision_id(revid))