/b-gtk/fix-viz : revision 533

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: Jelmer Vernooij
Date: 2008-07-17 11:51:03 UTC
Revision ID: jelmer@samba.org-20080717115103-djh5sb0pvpse2zkb

Add note about glade.

files added:
olive.glade

olive.gladep

files removed:
olive/window.py

files modified:
AUTHORS

NEWS

__init__.py

about.py

branchview/treeview.py

bzr-notify

commit.py

dialog.py

diff.py

errors.py

merge.py

notify.py

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

preferences/plugins.py

push.py

revisionview.py

seahorse.py

search.py

setup.py

ui.py

viz/branchwin.py

Show diffs side-by-side

added added

removed removed

viz/branchwin.py

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)

113

104

self.add(vbox)

114

105

115

106

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)

107

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

108

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

118

109

self.paned.show()

119

110

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

111

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

112

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

113

125

114

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

126

115

vbox.set_focus_child(self.paned)

127

116

128

117

vbox.show()

129

118

130

119

def construct_menubar(self):

131

120

menubar = gtk.MenuBar()

132

121

148

137

edit_menuitem = gtk.MenuItem("_Edit")

149

138

edit_menuitem.set_submenu(edit_menu)

150

139

140

edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)

141

151

142

edit_menu_branchopts = gtk.MenuItem("Branch Settings")

152

143

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

153

144

154

145

edit_menu_globopts = gtk.MenuItem("Global Settings")

155

146

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

156

147

148

edit_menu.add(edit_menu_find)

157

149

edit_menu.add(edit_menu_branchopts)

158

150

edit_menu.add(edit_menu_globopts)

159

151

169

161

170

162

view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")

171

163

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

164

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

176

165

177

166

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

178

167

view_menu_compact.set_active(self.compact_view)

179

168

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

169

199

170

view_menu.add(view_menu_toolbar)

200

171

view_menu.add(view_menu_compact)

201

172

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

173

207

174

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

208

175

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

308

275

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

309

276

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

310

277

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

278

align.show()

321

279

322

280

return align

344

302

345

303

def construct_bottom(self):

346

304

"""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

305

from bzrlib.plugins.gtk.revisionview import RevisionView

355

306

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')

307

(width, height) = self.get_size()

308

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

363

309

self.revisionview.show()

364

310

self.revisionview.set_show_callback(self._show_clicked_cb)

365

311

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

366

312

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

313

return self.revisionview

378

314

379

315

def _tag_selected_cb(self, menuitem, revid):

380

316

self.treeview.set_revision_id(revid)

431

367

432

368

self.revisionview.set_revision(revision)

433

369

self.revisionview.set_children(children)

434

self.update_diff_panel(revision, parents)

435

370

436

371

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

437

372

# TODO: more than one parent

438

373

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

485

420

_mod_index.index_url(self.branch.base)

486

421

487

422

def _branch_search_cb(self, w):

488

from bzrlib.plugins.search import index as _mod_index

489

423

from bzrlib.plugins.gtk.search import SearchDialog

490

from bzrlib.plugins.search import errors as search_errors

491

492

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)

424

dialog = SearchDialog(self.branch)

507

425

508

426

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

509

427

self.set_revision(dialog.get_revision())

521

439

522

440

def _toolbar_visibility_changed(self, col):

523

441

if col.get_active():

524

self.toolbar.show()

442

self.toolbar.show()

525

443

else:

526

444

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

445

562

446

def _show_about_cb(self, w):

563

447

dialog = AboutDialog()

564

448

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

589

473

590

474

self.go_menu_tags.show_all()

591

475

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

476

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

621

477

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

622

478

from bzrlib.plugins.gtk.diff import DiffWindow

632

488

window.set_diff(description, rev_tree, parent_tree)

633

489

window.show()

634

490

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()

491

Older »