/b-gtk/fix-viz : revision 473.1.1

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to viz/branchwin.py

Committer: Andrew Bennetts
Date: 2008-04-29 08:17:01 UTC
mto: This revision was merged to the branch mainline in revision 476.
Revision ID: andrew@puzzling.org-20080429081701-2pu9uteic8o88nre

Simple hack to fix gannotate.

files added:
olive.glade

olive.gladep

tests/test_tortoise_bzr.py

files removed:
bzr-notify

create-credits.py

olive-gtk.1

olive/window.py

search.py

tests/test_linegraph.py

files renamed:
bzr-handle-patch => handle-patch

files modified:
.bzrignore

AUTHORS

HACKING

NEWS

__init__.py

about.py

branch.py

branchview/graphcell.py

branchview/linegraph.py

branchview/treeview.py

bzr-gtk.applications

bzr-handle-patch.desktop

bzr-notify.desktop

checkout.py

commit.py

conflicts.py

dialog.py

diff.py

errors.py

genpot.sh

initialize.py

merge.py

nautilus-bzr.py

notify.py

olive-gtk.desktop

olive/__init__.py

olive/add.py

olive/bookmark.py

olive/guifiles.py

olive/info.py

olive/info_helper.py

olive/menu.py

olive/mkdir.py

olive/move.py

olive/remove.py

olive/rename.py

po/olive-gtk.pot

preferences/plugins.py

push.py

revbrowser.py

revisionmenu.py

revisionview.py

seahorse.py

setup.py

status.py

tags.py

tests/__init__.py

tests/test_commit.py

tests/test_diff.py

ui.py

viz/branchwin.py

Show diffs side-by-side

added added

removed removed

viz/branchwin.py

import gobject

import pango

from bzrlib.plugins.gtk.window import Window

from bzrlib.plugins.gtk import icon_path

from bzrlib.plugins.gtk.branchview import TreeView, treemodel

from bzrlib.plugins.gtk.tags import AddTagDialog

from bzrlib.plugins.gtk.preferences import PreferencesWindow

from bzrlib.plugins.gtk.revisionmenu import RevisionMenu

from bzrlib.plugins.gtk.window import Window

from bzrlib.config import BranchConfig, GlobalConfig

from bzrlib.plugins.gtk.branchview import TreeView, treemodel

from bzrlib.revision import Revision, NULL_REVISION

from bzrlib.trace import mutter

from bzrlib.config import BranchConfig

from bzrlib.config import GlobalConfig

class BranchWindow(Window):

"""Branch window.

self.maxnum = maxnum

self.config = GlobalConfig()

self._sizes = {} # window and widget sizes

if self.config.get_user_option('viz-compact-view') == 'yes':

self.compact_view = True

else:

self.set_title(branch.nick + " - revision history")

# user-configured window size

size = self._load_size('viz-window-size')

if size:

width, height = size

else:

# Use three-quarters of the screen by default

screen = self.get_screen()

monitor = screen.get_monitor_geometry(0)

width = int(monitor.width * 0.75)

height = int(monitor.height * 0.75)

# Use three-quarters of the screen by default

screen = self.get_screen()

monitor = screen.get_monitor_geometry(0)

width = int(monitor.width * 0.75)

height = int(monitor.height * 0.75)

self.set_default_size(width, height)

self.set_size_request(width/3, height/3)

self.connect("size-allocate", self._on_size_allocate, 'viz-window-size')

# FIXME AndyFitz!

icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)

gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)

gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)

gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)

self.accel_group = gtk.AccelGroup()

self.add_accel_group(self.accel_group)

self.next_rev_action.connect("activate", self._fwd_clicked_cb)

self.next_rev_action.connect_accelerator()

self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)

100

self.refresh_action.set_accel_path("<viz>/View/Refresh")

101

self.refresh_action.set_accel_group(self.accel_group)

102

self.refresh_action.connect("activate", self._refresh_clicked)

103

self.refresh_action.connect_accelerator()

104

105

self.construct()

106

107

def set_revision(self, revid):

113

self.add(vbox)

114

115

self.paned = gtk.VPaned()

116

self.paned.pack1(self.construct_top(), resize=False, shrink=True)

117

self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)

self.paned.pack1(self.construct_top(), resize=True, shrink=False)

self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)

118

100

self.paned.show()

119

101

120

nav = self.construct_navigation()

121

menubar = self.construct_menubar()

122

vbox.pack_start(menubar, expand=False, fill=True)

123

vbox.pack_start(nav, expand=False, fill=True)

124

102

vbox.pack_start(self.construct_menubar(), expand=False, fill=True)

103

vbox.pack_start(self.construct_navigation(), expand=False, fill=True)

104

125

105

vbox.pack_start(self.paned, expand=True, fill=True)

126

106

vbox.set_focus_child(self.paned)

127

107

128

108

vbox.show()

129

109

130

110

def construct_menubar(self):

131

111

menubar = gtk.MenuBar()

132

112

148

128

edit_menuitem = gtk.MenuItem("_Edit")

149

129

edit_menuitem.set_submenu(edit_menu)

150

130

131

edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)

132

151

133

edit_menu_branchopts = gtk.MenuItem("Branch Settings")

152

134

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

153

135

154

136

edit_menu_globopts = gtk.MenuItem("Global Settings")

155

137

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

156

138

139

edit_menu.add(edit_menu_find)

157

140

edit_menu.add(edit_menu_branchopts)

158

141

edit_menu.add(edit_menu_globopts)

159

142

161

144

view_menuitem = gtk.MenuItem("_View")

162

145

view_menuitem.set_submenu(view_menu)

163

146

164

view_menu_refresh = self.refresh_action.create_menu_item()

165

view_menu_refresh.connect('activate', self._refresh_clicked)

166

167

view_menu.add(view_menu_refresh)

168

view_menu.add(gtk.SeparatorMenuItem())

169

170

147

view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")

171

148

view_menu_toolbar.set_active(True)

172

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

173

view_menu_toolbar.set_active(False)

174

self.toolbar.hide()

175

149

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

176

150

177

151

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

178

152

view_menu_compact.set_active(self.compact_view)

179

153

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

180

181

view_menu_diffs = gtk.CheckMenuItem("Show Diffs")

182

view_menu_diffs.set_active(False)

183

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

184

view_menu_diffs.set_active(True)

185

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

186

187

view_menu_wide_diffs = gtk.CheckMenuItem("Wide Diffs")

188

view_menu_wide_diffs.set_active(False)

189

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

190

view_menu_wide_diffs.set_active(True)

191

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

192

193

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

194

view_menu_wrap_diffs.set_active(False)

195

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

196

view_menu_wrap_diffs.set_active(True)

197

view_menu_wrap_diffs.connect('toggled', self._diff_wrap_changed)

198

154

199

155

view_menu.add(view_menu_toolbar)

200

156

view_menu.add(view_menu_compact)

201

157

view_menu.add(gtk.SeparatorMenuItem())

202

view_menu.add(view_menu_diffs)

203

view_menu.add(view_menu_wide_diffs)

204

view_menu.add(view_menu_wrap_diffs)

205

view_menu.add(gtk.SeparatorMenuItem())

206

158

207

159

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

208

160

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

237

189

go_menu.add(gtk.SeparatorMenuItem())

238

190

go_menu.add(self.go_menu_tags)

239

191

240

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

192

revision_menu = gtk.Menu()

241

193

revision_menuitem = gtk.MenuItem("_Revision")

242

revision_menuitem.set_submenu(self.revision_menu)

194

revision_menuitem.set_submenu(revision_menu)

195

196

revision_menu_diff = gtk.MenuItem("View Changes")

197

revision_menu_diff.connect('activate',

198

self._menu_diff_cb)

199

200

revision_menu_compare = gtk.MenuItem("Compare with...")

201

revision_menu_compare.connect('activate',

202

self._compare_with_cb)

203

204

revision_menu_tag = gtk.MenuItem("Tag Revision")

205

revision_menu_tag.connect('activate', self._tag_revision_cb)

206

207

revision_menu.add(revision_menu_tag)

208

revision_menu.add(revision_menu_diff)

209

revision_menu.add(revision_menu_compare)

243

210

244

211

branch_menu = gtk.Menu()

245

212

branch_menuitem = gtk.MenuItem("_Branch")

248

215

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

249

216

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

250

217

251

try:

252

from bzrlib.plugins import search

253

except ImportError:

254

mutter("Didn't find search plugin")

255

else:

256

branch_menu.add(gtk.SeparatorMenuItem())

257

258

branch_index_menuitem = gtk.MenuItem("_Index")

259

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

260

branch_menu.add(branch_index_menuitem)

261

262

branch_search_menuitem = gtk.MenuItem("_Search")

263

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

264

branch_menu.add(branch_search_menuitem)

265

266

218

help_menu = gtk.Menu()

267

219

help_menuitem = gtk.MenuItem("_Help")

268

220

help_menuitem.set_submenu(help_menu)

308

260

align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)

309

261

align.set_padding(5, 0, 0, 0)

310

262

align.add(self.treeview)

311

# user-configured size

312

size = self._load_size('viz-graph-size')

313

if size:

314

width, height = size

315

align.set_size_request(width, height)

316

else:

317

(width, height) = self.get_size()

318

align.set_size_request(width, int(height / 2.5))

319

align.connect('size-allocate', self._on_size_allocate, 'viz-graph-size')

320

263

align.show()

321

264

322

265

return align

344

287

345

288

def construct_bottom(self):

346

289

"""Construct the bottom half of the window."""

347

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

348

self.diff_paned = gtk.VPaned()

349

else:

350

self.diff_paned = gtk.HPaned()

351

(width, height) = self.get_size()

352

self.diff_paned.set_size_request(20, 20) # shrinkable

353

354

290

from bzrlib.plugins.gtk.revisionview import RevisionView

355

291

self.revisionview = RevisionView(branch=self.branch)

356

self.revisionview.set_size_request(width/3, int(height / 2.5))

357

# user-configured size

358

size = self._load_size('viz-revisionview-size')

359

if size:

360

width, height = size

361

self.revisionview.set_size_request(width, height)

362

self.revisionview.connect('size-allocate', self._on_size_allocate, 'viz-revisionview-size')

292

(width, height) = self.get_size()

293

self.revisionview.set_size_request(width, int(height / 2.5))

363

294

self.revisionview.show()

364

295

self.revisionview.set_show_callback(self._show_clicked_cb)

365

296

self.revisionview.connect('notify::revision', self._go_clicked_cb)

366

297

self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())

367

self.diff_paned.pack1(self.revisionview)

368

369

from bzrlib.plugins.gtk.diff import DiffWidget

370

self.diff = DiffWidget()

371

self.diff_paned.pack2(self.diff)

372

373

self.diff_paned.show_all()

374

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

375

self.diff.hide()

376

377

return self.diff_paned

298

return self.revisionview

378

299

379

300

def _tag_selected_cb(self, menuitem, revid):

380

301

self.treeview.set_revision_id(revid)

385

306

parents = self.treeview.get_parents()

386

307

children = self.treeview.get_children()

387

308

388

self.revision_menu.set_revision_ids([revision.revision_id])

389

390

309

if revision and revision != NULL_REVISION:

391

310

prev_menu = gtk.Menu()

392

311

if len(parents) > 0:

431

350

432

351

self.revisionview.set_revision(revision)

433

352

self.revisionview.set_children(children)

434

self.update_diff_panel(revision, parents)

435

353

436

354

def _tree_revision_activated(self, widget, path, col):

437

355

# TODO: more than one parent

438

356

"""Callback for when a treeview row gets activated."""

447

365

self.show_diff(revision.revision_id, parent_id)

448

366

self.treeview.grab_focus()

449

367

368

def _menu_diff_cb(self,w):

369

(path, focus) = self.treeview.treeview.get_cursor()

370

revid = self.treeview.model[path][treemodel.REVID]

371

372

parentids = self.branch.repository.revision_parents(revid)

373

374

if len(parentids) == 0:

375

parentid = NULL_REVISION

376

else:

377

parentid = parentids[0]

378

379

self.show_diff(revid,parentid)

380

450

381

def _back_clicked_cb(self, *args):

451

382

"""Callback for when the back button is clicked."""

452

383

self.treeview.back()

465

396

self.show_diff(revid, parentid)

466

397

self.treeview.grab_focus()

467

398

399

def _compare_with_cb(self,w):

400

"""Callback for revision 'compare with' menu. Will show a small

401

dialog with branch revisions to compare with selected revision in TreeView"""

402

403

from bzrlib.plugins.gtk.revbrowser import RevisionBrowser

404

405

rb = RevisionBrowser(self.branch,self)

406

ret = rb.run()

407

408

if ret == gtk.RESPONSE_OK:

409

(path, focus) = self.treeview.treeview.get_cursor()

410

revid = self.treeview.model[path][treemodel.REVID]

411

self.show_diff(revid, rb.selected_revid)

412

413

rb.destroy()

414

468

415

def _set_revision_cb(self, w, revision_id):

469

416

self.treeview.set_revision_id(revision_id)

470

417

480

427

self.treeview.set_property('compact', self.compact_view)

481

428

self.treeview.refresh()

482

429

483

def _branch_index_cb(self, w):

484

from bzrlib.plugins.search import index as _mod_index

485

_mod_index.index_url(self.branch.base)

486

487

def _branch_search_cb(self, w):

488

from bzrlib.plugins.search import index as _mod_index

489

from bzrlib.plugins.gtk.search import SearchDialog

490

from bzrlib.plugins.search import errors as search_errors

491

430

def _tag_revision_cb(self, w):

492

431

try:

493

index = _mod_index.open_index_url(self.branch.base)

494

except search_errors.NoSearchIndex:

495

dialog = gtk.MessageDialog(self, type=gtk.MESSAGE_QUESTION,

496

buttons=gtk.BUTTONS_OK_CANCEL,

497

message_format="This branch has not been indexed yet. "

498

"Index now?")

499

if dialog.run() == gtk.RESPONSE_OK:

500

dialog.destroy()

501

index = _mod_index.index_url(self.branch.base)

502

else:

503

dialog.destroy()

504

return

505

506

dialog = SearchDialog(index)

507

508

if dialog.run() == gtk.RESPONSE_OK:

509

self.set_revision(dialog.get_revision())

510

511

dialog.destroy()

432

self.treeview.set_sensitive(False)

433

dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)

434

response = dialog.run()

435

if response != gtk.RESPONSE_NONE:

436

dialog.hide()

437

438

if response == gtk.RESPONSE_OK:

439

self.treeview.add_tag(dialog.tagname, dialog._revid)

440

441

dialog.destroy()

442

443

finally:

444

self.treeview.set_sensitive(True)

512

445

513

446

def _about_dialog_cb(self, w):

514

447

from bzrlib.plugins.gtk.about import AboutDialog

521

454

522

455

def _toolbar_visibility_changed(self, col):

523

456

if col.get_active():

524

self.toolbar.show()

457

self.toolbar.show()

525

458

else:

526

459

self.toolbar.hide()

527

self.config.set_user_option('viz-toolbar-visible', col.get_active())

528

529

def _make_diff_nonzero_size(self):

530

"""make sure the diff isn't zero-width or zero-height"""

531

alloc = self.diff.get_allocation()

532

if (alloc.width < 10) or (alloc.height < 10):

533

width, height = self.get_size()

534

self.revisionview.set_size_request(width/3, int(height / 2.5))

535

536

def _diff_visibility_changed(self, col):

537

"""Hide or show the diff panel."""

538

if col.get_active():

539

self.diff.show()

540

self._make_diff_nonzero_size()

541

else:

542

self.diff.hide()

543

self.config.set_user_option('viz-show-diffs', str(col.get_active()))

544

self.update_diff_panel()

545

546

def _diff_placement_changed(self, col):

547

"""Toggle the diff panel's position."""

548

self.config.set_user_option('viz-wide-diffs', str(col.get_active()))

549

550

old = self.paned.get_child2()

551

self.paned.remove(old)

552

self.paned.pack2(self.construct_bottom(), resize=True, shrink=False)

553

self._make_diff_nonzero_size()

554

555

self.treeview.emit('revision-selected')

556

557

def _diff_wrap_changed(self, widget):

558

"""Toggle word wrap in the diff widget."""

559

self.config.set_user_option('viz-wrap-diffs', widget.get_active())

560

self.diff._on_wraplines_toggled(widget)

561

460

562

461

def _show_about_cb(self, w):

563

462

dialog = AboutDialog()

564

463

dialog.connect('response', lambda d,r: d.destroy())

589

488

590

489

self.go_menu_tags.show_all()

591

490

592

def _load_size(self, name):

593

"""Read and parse 'name' from self.config.

594

The value is a string, formatted as WIDTHxHEIGHT

595

Returns None, or (width, height)

596

"""

597

size = self.config.get_user_option(name)

598

if size:

599

width, height = [int(num) for num in size.split('x')]

600

# avoid writing config every time we start

601

self._sizes[name] = (width, height)

602

return width, height

603

return None

604

605

def _on_size_allocate(self, widget, allocation, name):

606

"""When window has been resized, save the new size."""

607

width, height = 0, 0

608

if name in self._sizes:

609

width, height = self._sizes[name]

610

611

size_changed = (width != allocation.width) or \

612

(height != allocation.height)

613

614

if size_changed:

615

width, height = allocation.width, allocation.height

616

self._sizes[name] = (width, height)

617

value = '%sx%s' % (width, height)

618

self.config.set_user_option(name, value)

619

620

491

def show_diff(self, revid=None, parentid=None):

621

492

"""Open a new window to show a diff between the given revisions."""

622

493

from bzrlib.plugins.gtk.diff import DiffWindow

632

503

window.set_diff(description, rev_tree, parent_tree)

633

504

window.show()

634

505

635

def update_diff_panel(self, revision=None, parents=None):

636

"""Show the current revision in the diff panel."""

637

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

638

return

639

640

if not revision: # default to selected row

641

revision = self.treeview.get_revision()

642

if (not revision) or (revision == NULL_REVISION):

643

return

644

645

if not parents: # default to selected row's parents

646

parents = self.treeview.get_parents()

647

if len(parents) == 0:

648

parent_id = None

649

else:

650

parent_id = parents[0]

651

652

rev_tree = self.branch.repository.revision_tree(revision.revision_id)

653

parent_tree = self.branch.repository.revision_tree(parent_id)

654

655

self.diff.set_diff(rev_tree, parent_tree)

656

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

657

self.diff._on_wraplines_toggled(wrap=True)

658

self.diff.show_all()

506

Older »