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

List:       kde-commits
Subject:    KDE_3_1_BRANCH: kdesdk/cervisia
From:       Christian Loose <christian.loose () hamburg ! de>
Date:       2003-02-28 22:17:31
[Download RAW message or body]

CVS commit by cloose: 

backport fix for BR #54382: 
Display warning message in remove dialog to make clear 
that the action will also remove the local copy of the selected files.

BTW, is it okay to add new i18n strings to the branch???

CCMAIL: 54382-done@bugs.kde.org


  M +6 -0      ChangeLog   1.22.2.7
  M +21 -0     commitdlg.cpp   1.6.2.2


--- kdesdk/cervisia/ChangeLog  #1.22.2.6:1.22.2.7
@@ -1,2 +1,8 @@
+2003-02-28  Christian Loose <christian.loose@hamburg.de>
+
+        * Fix BR #54382: Display warning message in remove dialog
+          to make clear that the action will also remove the local
+          copy of the selected files.
+
 2003-02-24  Christian Loose <christian.loose@hamburg.de>
 

--- kdesdk/cervisia/commitdlg.cpp  #1.6.2.1:1.6.2.2
@@ -20,4 +20,5 @@
 #include <kapplication.h>
 #include <kbuttonbox.h>
+#include <kiconloader.h>
 #include <klocale.h>
 #include <kconfig.h>
@@ -76,4 +77,24 @@ CommitDialog::CommitDialog(ActionType ac
         listbox->setEnabled(false);
     
+    if (action == Remove)    
+        {
+            QBoxLayout *warningLayout = new QHBoxLayout(this);
+
+            QLabel *warningIcon = new QLabel(this);
+            KIconLoader *loader = kapp->iconLoader();
+            warningIcon->setPixmap(loader->loadIcon("messagebox_warning", KIcon::NoGroup,
+                                                    KIcon::SizeMedium, KIcon::DefaultState,
+                                                    0, true));
+            warningLayout->addWidget(warningIcon);
+
+            QLabel *warningText = new QLabel(i18n("This will also remove the files from "
+                                                  "your local working copy!"), this);
+            warningLayout->addWidget(warningText);
+    
+            layout->addSpacing(5);
+            layout->addLayout(warningLayout);
+            layout->addSpacing(5);
+        }
+        
     QFrame *frame = new QFrame(this);
     frame->setFrameStyle(QFrame::HLine | QFrame::Sunken);


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