From 114a878c64ce6f8223cfd22d76a20eb16d177e5e Mon Sep 17 00:00:00 2001 From: toma Date: Wed, 25 Nov 2009 17:56:58 +0000 Subject: Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features. BUG:215923 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- vcs/subversion/svn_mergeoptiondlgbase.ui | 374 +++++++++++++++++++++++++++++++ 1 file changed, 374 insertions(+) create mode 100644 vcs/subversion/svn_mergeoptiondlgbase.ui (limited to 'vcs/subversion/svn_mergeoptiondlgbase.ui') diff --git a/vcs/subversion/svn_mergeoptiondlgbase.ui b/vcs/subversion/svn_mergeoptiondlgbase.ui new file mode 100644 index 00000000..0ad25c83 --- /dev/null +++ b/vcs/subversion/svn_mergeoptiondlgbase.ui @@ -0,0 +1,374 @@ + +SvnMergeOptionDialogBase + + + SvnMergeOptionDialogBase + + + + 0 + 0 + 473 + 590 + + + + Subversion Merge + + + + unnamed + + + + groupBox1 + + + Destination + + + + unnamed + + + + textLabel1 + + + Destination working path + + + + + dest + + + + + + + buttonGroup2 + + + Source 1 + + + + unnamed + + + + revnum1 + + + + 1 + 0 + 0 + 0 + + + + -1 + + + + + revnumbtn1 + + + Number: + + + true + + + + + revkindbtn1 + + + Keyword: + + + + + + HEAD + + + + + BASE + + + + + COMMITTED + + + + + PREV + + + + revkind1 + + + + 7 + 0 + 1 + 0 + + + + true + + + 1 + + + + + src1 + + + + + textLabel3 + + + Source URL or working path: + + + + + textLabel2 + + + Specify revision as + + + + + + + buttonGroup2_2 + + + Source 2 + + + + unnamed + + + + revnumbtn2 + + + Number: + + + + + revkindbtn2 + + + Keyword: + + + true + + + + + src2 + + + + + textLabel2_2 + + + Specify revision as + + + + + + HEAD + + + + + BASE + + + + + COMMITTED + + + + + PREV + + + + revkind2 + + + + 7 + 0 + 1 + 0 + + + + true + + + 0 + + + + + revnum2 + + + + 1 + 0 + 0 + 0 + + + + -1 + + + + + textLabel3_2 + + + Source URL or working path: + + + + + + + okBtn + + + OK + + + + + spacer1 + + + Horizontal + + + Expanding + + + + 171 + 31 + + + + + + cancelBtn + + + Cancel + + + + + forceCheck + + + --force (Force to delete locally modified or unversioned items.) + + + + + nonRecurse + + + --non-recursive + + + + + ignoreAncestryCheck + + + --ignore-ancestry + + + + + dryRunCheck + + + + 1 + 1 + 0 + 0 + + + + --dry-run (Only receive full result notification + without actually modifying working copy) + + + + + + + okBtn + clicked() + SvnMergeOptionDialogBase + accept() + + + cancelBtn + clicked() + SvnMergeOptionDialogBase + reject() + + + + + kurlrequester.h + klineedit.h + kpushbutton.h + knuminput.h + knuminput.h + kcombobox.h + klineedit.h + kurlrequester.h + klineedit.h + kpushbutton.h + kurlrequester.h + klineedit.h + kpushbutton.h + kcombobox.h + klineedit.h + knuminput.h + knuminput.h + + -- cgit v1.2.3