[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdevelop/vcs/cvsservice
From:       Sascha Cunz <mail () sacu ! de>
Date:       2004-04-19 21:28:06
Message-ID: 20040419212806.9090F9A44 () office ! kde ! org
[Download RAW message or body]

CVS commit by cunz: 

Added a "Difference to BASE" option and made "Difference to HEAD" option actually work


  M +4 -0      diffdialog.cpp   1.4
  M +1 -1      diffdialog.h   1.3
  M +17 -2     diffdialogbase.ui   1.10


--- kdevelop/vcs/cvsservice/diffdialog.cpp  #1.3:1.4
@@ -38,4 +38,6 @@ DiffDialog::DiffType DiffDialog::request
     else if (diffLocalOtherRadio->isChecked())
         return diffLocalOther;
+    else if (diffLocalBaseRadio->isChecked())
+        return diffLocalBASE;
     else
         return diffLocalHEAD;
@@ -50,4 +52,6 @@ QString DiffDialog::revA() const
     else  if (requestedDiff() == diffLocalOther)
         return revOtherEdit->text();
+    else  if (requestedDiff() == diffLocalHEAD)
+        return "HEAD";
     else
         return QString::null;

--- kdevelop/vcs/cvsservice/diffdialog.h  #1.2:1.3
@@ -31,5 +31,5 @@ public:
 
 private:
-    enum  DiffType { diffLocalHEAD, diffLocalOther, diffArbitrary };
+    enum  DiffType { diffLocalBASE, diffLocalHEAD, diffLocalOther, diffArbitrary };
 
     DiffType requestedDiff() const;

--- kdevelop/vcs/cvsservice/diffdialogbase.ui  #1.9:1.10
@@ -36,8 +36,8 @@
                 <widget class="QRadioButton">
                     <property name="name">
-                        <cstring>diffLocalHeadRadio</cstring>
+                        <cstring>diffLocalBaseRadio</cstring>
                     </property>
                     <property name="text">
-                        <string>&amp;Local copy and HEAD</string>
+                        <string>&amp;Local copy and BASE</string>
                     </property>
                     <property name="accel">
@@ -48,4 +48,18 @@
                     </property>
                 </widget>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>diffLocalHeadRadio</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Local copy and &amp;HEAD</string>
+                    </property>
+                    <property name="accel">
+                        <string>Alt+H</string>
+                    </property>
+                    <property name="checked">
+                        <bool>false</bool>
+                    </property>
+                </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
@@ -264,4 +278,5 @@
 </connections>
 <tabstops>
+    <tabstop>diffLocalBaseRadio</tabstop>
     <tabstop>diffLocalHeadRadio</tabstop>
     <tabstop>diffLocalOtherRadio</tabstop>


[prev in list] [next in list] [prev in thread] [next in thread]