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

List:       kde-commits
Subject:    [rekonq/frameworks] /: Adblock Widget final port
From:       Andrea Diamantini <adjam7 () gmail ! com>
Date:       2014-07-12 17:39:06
Message-ID: E1X61GM-0000Ef-Nz () scm ! kde ! org
[Download RAW message or body]

Git commit ef931e3229c7486f6cd415a1696c75eeef1580e1 by Andrea Diamantini.
Committed on 11/07/2014 at 22:03.
Pushed by adjam into branch 'frameworks'.

Adblock Widget final port

M  +1    -0    CMakeLists.txt
M  +1    -0    src/CMakeLists.txt
M  +0    -1    src/adblock/adblockmanager.cpp
M  +1    -2    src/adblock/adblocksettingwidget.cpp
M  +9    -2    src/adblock/settings_adblock.ui
M  +1    -1    src/history/historymodels.cpp
M  +0    -2    src/icons/iconmanager.cpp

http://commits.kde.org/rekonq/ef931e3229c7486f6cd415a1696c75eeef1580e1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2edfbda..e1b04ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,7 @@ FIND_PACKAGE (KF5 CONFIG REQUIRED
     I18n
     IconThemes
     Init
+    ItemViews
     JobWidgets
     KCMUtils
     Notifications
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4de3b46..ec2242e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -258,6 +258,7 @@ TARGET_LINK_LIBRARIES (     kdeinit_rekonq
                             KF5::GuiAddons
                             KF5::I18n
                             KF5::IconThemes
+                            KF5::ItemViews
                             KF5::JobWidgets
                             KF5::KCMUtils
                             KF5::Notifications
diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index 88f7046..dc0a669 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -105,7 +105,6 @@ void AdBlockManager::loadSettings()
     {
         const QString generalAdblockFilePath = \
QStandardPaths::locate(QStandardPaths::DataLocation, QL1S("adblockrc"));  QFile \
                adblockFile(generalAdblockFilePath);
-        // FIXME problem with non extant directory
         const bool copied = adblockFile.copy(adblockFilePath);
         if (!copied)
         {
diff --git a/src/adblock/adblocksettingwidget.cpp \
b/src/adblock/adblocksettingwidget.cpp index 8a0a134..079cbe2 100644
--- a/src/adblock/adblocksettingwidget.cpp
+++ b/src/adblock/adblocksettingwidget.cpp
@@ -62,8 +62,7 @@ AdBlockSettingWidget::AdBlockSettingWidget(KSharedConfig::Ptr \
config, QWidget *p  tabWidget->setTabText(0, i18n("Automatic Filters"));
     tabWidget->setTabText(1, i18n("Manual Filters"));
 
-    // FIXME
-//     searchLine->setListWidget(manualFiltersListWidget);
+    searchLine->setListWidget(manualFiltersListWidget);
 
     insertButton->setIcon(QIcon::fromTheme( QL1S("list-add") ));
     connect(insertButton, SIGNAL(clicked()), this, SLOT(insertRule()));
diff --git a/src/adblock/settings_adblock.ui b/src/adblock/settings_adblock.ui
index 4aae196..01811ea 100644
--- a/src/adblock/settings_adblock.ui
+++ b/src/adblock/settings_adblock.ui
@@ -31,7 +31,7 @@
       <string/>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tabWidgetPage1">
       <attribute name="title">
@@ -98,7 +98,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QLineEdit" name="searchLine"/>
+          <widget class="KListWidgetSearchLine" name="searchLine"/>
          </item>
         </layout>
        </item>
@@ -183,6 +183,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KListWidgetSearchLine</class>
+   <extends>QLineEdit</extends>
+   <header location="global">KListWidgetSearchLine</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index a436a74..454fe5c 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -572,7 +572,7 @@ QModelIndex HistoryTreeModel::parent(const QModelIndex &index) \
const  int offset = index.internalId();
     if (offset == 0 || !index.isValid())
         return QModelIndex();
-    return createIndex(offset - 1, 0);  // FIXME added a ZERO
+    return createIndex(offset - 1, 0);  // NOTE: added a ZERO (the column) in the \
porting  }
 
 
diff --git a/src/icons/iconmanager.cpp b/src/icons/iconmanager.cpp
index a3efafa..aa6861f 100644
--- a/src/icons/iconmanager.cpp
+++ b/src/icons/iconmanager.cpp
@@ -143,8 +143,6 @@ void IconManager::saveDesktopIconForUrl(const QUrl &u)
 // with an important difference: this one returns paths while the other one returns \
QIcons  QString IconManager::iconPathForUrl(const QUrl &url)
 {
-    // FIXME needs porting
-    
     // first things first.. avoid infinite loop at startup
     if (url.isEmpty() || rApp->rekonqWindowList().isEmpty())
     {


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