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

List:       kde-commits
Subject:    [kde-baseapps] konqueror/settings/kio: - Renamed a button text from "Change Policy" to "Configure Po
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2012-10-05 0:20:05
Message-ID: 20121005002005.F31FAA6096 () git ! kde ! org
[Download RAW message or body]

Git commit 61d0fe391b9489f7109d158550b0a34d2beccf07 by Dawit Alemayehu.
Committed on 05/10/2012 at 00:03.
Pushed by adawit into branch 'master'.

- Renamed a button text from "Change Policy" to "Configure Policy" because it
  allows you to either add or modify a new policy from the management dialog.

- Enable/disable the policy domain edit and ok button as needed. The user will
  no longer be allowed to change the domain of existing policies.

- Renamed a couple of UI variable name to refelect their actual purpose.

M  +13   -23   konqueror/settings/kio/kcookiesmanagement.cpp
M  +1    -1    konqueror/settings/kio/kcookiesmanagement.h
M  +2    -2    konqueror/settings/kio/kcookiesmanagement.ui
M  +16   -2    konqueror/settings/kio/kcookiespolicyselectiondlg.cpp
M  +2    -0    konqueror/settings/kio/kcookiespolicyselectiondlg.h

http://commits.kde.org/kde-baseapps/61d0fe391b9489f7109d158550b0a34d2beccf07

diff --git a/konqueror/settings/kio/kcookiesmanagement.cpp \
b/konqueror/settings/kio/kcookiesmanagement.cpp index 80b3a62..ad6f96a 100644
--- a/konqueror/settings/kio/kcookiesmanagement.cpp
+++ b/konqueror/settings/kio/kcookiesmanagement.cpp
@@ -119,7 +119,7 @@ KCookiesManagement::KCookiesManagement(const KComponentData \
&componentData, QWid  mUi.setupUi(this);
   mUi.searchLineEdit->setTreeWidget(mUi.cookiesTreeWidget);
   mUi.cookiesTreeWidget->setColumnWidth(0, 150);
-  connect(mUi.cookiesTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), \
SLOT(on_changePolicyButton_clicked())); +  connect(mUi.cookiesTreeWidget, \
SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), \
SLOT(on_configPolicyButton_clicked()));  }
 
 KCookiesManagement::~KCookiesManagement()
@@ -213,7 +213,7 @@ void KCookiesManagement::reset(bool deleteAll)
   mUi.cookiesTreeWidget->clear();
   mUi.deleteButton->setEnabled(false);
   mUi.deleteAllButton->setEnabled(false);
-  mUi.changePolicyButton->setEnabled(false);
+  mUi.configPolicyButton->setEnabled(false);
 }
 
 void KCookiesManagement::clearCookieDetails()
@@ -345,10 +345,10 @@ bool KCookiesManagement::cookieDetails(CookieProp *cookie)
 
 void KCookiesManagement::on_cookiesTreeWidget_currentItemChanged(QTreeWidgetItem* \
item)  {
-  if (!item)
-    return;
+  Q_ASSERT(item);
+  CookieListViewItem* cookieItem = static_cast<CookieListViewItem*>(item);
+  CookieProp *cookie = (cookieItem ? cookieItem->cookie() : 0);
 
-  CookieProp *cookie = static_cast<CookieListViewItem*>(item)->cookie();
   if (cookie)
   {
     if (cookie->allLoaded || cookieDetails(cookie))
@@ -361,36 +361,25 @@ void \
KCookiesManagement::on_cookiesTreeWidget_currentItemChanged(QTreeWidgetItem  \
mUi.secureLineEdit->setText(cookie->secure);  }
 
-    mUi.changePolicyButton->setEnabled(false);
+    mUi.configPolicyButton->setEnabled(false);
   }
   else
   {
     clearCookieDetails();
-    mUi.changePolicyButton->setEnabled(true);
+    mUi.configPolicyButton->setEnabled(true);
   }
 
   mUi.deleteButton->setEnabled(true);
 }
 
-void KCookiesManagement::on_changePolicyButton_clicked()
+void KCookiesManagement::on_configPolicyButton_clicked()
 {
   // Get current item
   CookieListViewItem *item = \
static_cast<CookieListViewItem*>(mUi.cookiesTreeWidget->currentItem());  
-  if (item && item->cookie())
+  if (item)
   {
-    CookieProp *cookie = item->cookie();
-
-    QString domain = cookie->domain;
-
-    if (domain.isEmpty())
-    {
-      CookieListViewItem *parent = static_cast<CookieListViewItem*>(item->parent());
-      if (parent)
-        domain = parent->domain ();
-    }
-
-    KCookiesMain* mainDlg = static_cast<KCookiesMain*>(mMainWidget);
+    KCookiesMain* mainDlg = qobject_cast<KCookiesMain*>(mMainWidget);
     // must be present or something is really wrong.
     Q_ASSERT(mainDlg);
 
@@ -398,7 +387,8 @@ void KCookiesManagement::on_changePolicyButton_clicked()
     // must be present unless someone rewrote the widget in which case
     // this needs to be re-written as well.
     Q_ASSERT(policyDlg);
-    policyDlg->setPolicy(domain);
+    
+    policyDlg->setPolicy(item->domain());
   }
 }
 
@@ -406,7 +396,7 @@ void KCookiesManagement::on_deleteButton_clicked()
 {
   QTreeWidgetItem* currentItem = mUi.cookiesTreeWidget->currentItem();
   CookieListViewItem *item = static_cast<CookieListViewItem*>( currentItem );
-  if (item->cookie())
+  if (item && item->cookie())
   {
     CookieListViewItem *parent = static_cast<CookieListViewItem*>(item->parent());
     CookiePropList list = mDeletedCookies.value(parent->domain());
diff --git a/konqueror/settings/kio/kcookiesmanagement.h \
b/konqueror/settings/kio/kcookiesmanagement.h index e6f3088..811893c 100644
--- a/konqueror/settings/kio/kcookiesmanagement.h
+++ b/konqueror/settings/kio/kcookiesmanagement.h
@@ -73,7 +73,7 @@ private Q_SLOTS:
     void on_reloadButton_clicked();
     void on_cookiesTreeWidget_itemExpanded(QTreeWidgetItem*);
     void on_cookiesTreeWidget_currentItemChanged(QTreeWidgetItem*);
-    void on_changePolicyButton_clicked();
+    void on_configPolicyButton_clicked();
 
 private:
     void reset (bool deleteAll = false);
diff --git a/konqueror/settings/kio/kcookiesmanagement.ui \
b/konqueror/settings/kio/kcookiesmanagement.ui index 09d4213..461ec19 100644
--- a/konqueror/settings/kio/kcookiesmanagement.ui
+++ b/konqueror/settings/kio/kcookiesmanagement.ui
@@ -65,9 +65,9 @@
     </widget>
    </item>
    <item row="3" column="1">
-    <widget class="QPushButton" name="changePolicyButton">
+    <widget class="QPushButton" name="configPolicyButton">
      <property name="text">
-      <string>Change &amp;Policy...</string>
+      <string>Configure &amp;Policy...</string>
      </property>
     </widget>
    </item>
diff --git a/konqueror/settings/kio/kcookiespolicyselectiondlg.cpp \
b/konqueror/settings/kio/kcookiespolicyselectiondlg.cpp index 57ee5e9..e299649 100644
--- a/konqueror/settings/kio/kcookiespolicyselectiondlg.cpp
+++ b/konqueror/settings/kio/kcookiespolicyselectiondlg.cpp
@@ -61,6 +61,7 @@ public:
 
 KCookiesPolicySelectionDlg::KCookiesPolicySelectionDlg (QWidget* parent, \
Qt::WindowFlags flags)  : KDialog (parent, flags)
+      , mOldPolicy(-1)
 {
     mUi.setupUi(mainWidget());
     mUi.leDomain->setValidator(new DomainNameValidator (mUi.leDomain));
@@ -70,15 +71,17 @@ KCookiesPolicySelectionDlg::KCookiesPolicySelectionDlg (QWidget* \
parent, Qt::Win  connect(mUi.leDomain, SIGNAL(textEdited(QString)),
             SLOT(slotTextChanged(QString)));
     connect(mUi.cbPolicy, SIGNAL(currentIndexChanged(QString)),
-            SLOT(slotTextChanged(QString)));
+            SLOT(slotPolicyChanged(QString)));
 
     mUi.leDomain->setFocus();
 }
 
 void KCookiesPolicySelectionDlg::setEnableHostEdit (bool state, const QString& host)
 {
-    if (!host.isEmpty())
+    if (!host.isEmpty()) {
         mUi.leDomain->setText (host);
+        enableButtonOk(state);
+    }
 
     mUi.leDomain->setEnabled (state);
 }
@@ -89,6 +92,7 @@ void KCookiesPolicySelectionDlg::setPolicy (int policy)
         const bool blocked = mUi.cbPolicy->blockSignals(true);
         mUi.cbPolicy->setCurrentIndex (policy - 1);
         mUi.cbPolicy->blockSignals(blocked);
+        mOldPolicy = policy;
     }
 
     if (!mUi.leDomain->isEnabled())
@@ -110,4 +114,14 @@ void KCookiesPolicySelectionDlg::slotTextChanged (const QString& \
text)  enableButtonOk (text.length() > 1);
 }
 
+void KCookiesPolicySelectionDlg::slotPolicyChanged(const QString& policyText)
+{
+    const int policy = KCookieAdvice::strToAdvice(policyText);
+    if (!mUi.leDomain->isEnabled()) {
+        enableButtonOk(policy != mOldPolicy);
+    } else {
+        slotTextChanged(policyText);
+    }
+}
+
 #include "kcookiespolicyselectiondlg.moc"
diff --git a/konqueror/settings/kio/kcookiespolicyselectiondlg.h \
b/konqueror/settings/kio/kcookiespolicyselectiondlg.h index d924721..9b10ad4 100644
--- a/konqueror/settings/kio/kcookiespolicyselectiondlg.h
+++ b/konqueror/settings/kio/kcookiespolicyselectiondlg.h
@@ -79,8 +79,10 @@ public:
 
 protected Q_SLOTS:
     void slotTextChanged (const QString&);
+    void slotPolicyChanged(const QString&);
 
 private:
+    int mOldPolicy;
     Ui::KCookiesPolicySelectionDlgUI mUi;
 };
 #endif


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