From c84b05142de9fd1086e4a8754772d4bd8c585ff5 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sun, 30 Dec 2007 20:52:12 -0800 Subject: [PATCH] Finished the option gui --- ui/optionsgui.ui | 352 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 253 insertions(+), 99 deletions(-) rewrite ui/optionsgui.ui (86%) diff --git a/ui/optionsgui.ui b/ui/optionsgui.ui dissimilarity index 86% index 53a4e5e..e913f7d 100644 --- a/ui/optionsgui.ui +++ b/ui/optionsgui.ui @@ -1,99 +1,253 @@ - - optionsgui - - - - 0 - 0 - 404 - 321 - - - - Options - - - - - 280 - 20 - 50 - 22 - - - - 2 - - - 4 - - - - - - 90 - 30 - 151 - 16 - - - - Diff Context Lines - - - - - - 30 - 140 - 211 - 21 - - - - Summarize Merge Commits - - - - - - 60 - 220 - 179 - 22 - - - - - - - 250 - 220 - 50 - 22 - - - - 8 - - - 12 - - - - - - 300 - 280 - 75 - 26 - - - - Done - - - - - - + + optionsgui + + + + 0 + 0 + 543 + 313 + + + + Options + + + + + + Main Font + + + + + + + 8 + + + 12 + + + + + + + + + + Diff/Console Font + + + + + + + 8 + + + 12 + + + + + + + + Bitstream Vera Sans Mono + + + + + + + + Local Repository + + + + + + User Name: + + + + + + + + + + Email Address: + + + + + + + + + + Summarize Merge Commits + + + + + + + Show Diffstat After Merge + + + + + + + Merge Verbosity: + + + + + + + 0 + + + 5 + + + 5 + + + + + + + Number of Diff Context Lines: + + + + + + + 2 + + + 5 + + + + + + + + + + Global (All Repositories) + + + + + + User Name: + + + + + + + + + + Email Address: + + + + + + + + + + Summarize Merge Commits + + + + + + + Show Diffstat After Merge + + + + + + + Merge Verbosity: + + + + + + + 0 + + + 5 + + + 5 + + + + + + + Number of Diff Context Lines: + + + + + + + 2 + + + 5 + + + + + + + + + + Qt::LeftToRight + + + QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + + + + + + + + buttonBox + rejected() + optionsgui + accept() + + + 179 + 392 + + + 295 + 218 + + + + + -- 2.11.4.GIT