Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...

[dolphin.git] / src / bookmarkssettingspage.cpp

diff --git a/src/bookmarkssettingspage.cpp b/src/bookmarkssettingspage.cpp
index 58b06534b583823f95812126385921b34e025ed1..89caede0c738b7172660be3c086c4a435925482f 100644 (file)
--- a/src/bookmarkssettingspage.cpp
+++ b/src/bookmarkssettingspage.cpp
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *

- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *

  ***************************************************************************/
 
 #include "bookmarkssettingspage.h"
  ***************************************************************************/
 
 #include "bookmarkssettingspage.h"


@@ -25,7 +25,7 @@
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qlineedit.h>

-#include <q3vbox.h>
+

 //Added by qt3to4:
 #include <QPixmap>
 #include <Q3VBoxLayout>
 //Added by qt3to4:
 #include <QPixmap>
 #include <Q3VBoxLayout>


@@ -34,30 +34,33 @@
 #include <kbookmarkmanager.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <kbookmarkmanager.h>
 #include <kdialog.h>
 #include <kiconloader.h>

-#include <klistview.h>
+#include <k3listview.h>

 #include <klocale.h>
 #include <kpushbutton.h>
 #include <klocale.h>
 #include <kpushbutton.h>

+#include <kvbox.h>

 
 #include "dolphinsettings.h"
 #include "editbookmarkdialog.h"
 
 
 #include "dolphinsettings.h"
 #include "editbookmarkdialog.h"
 

-BookmarksSettingsPage::BookmarksSettingsPage(QWidget*parent) :
+BookmarksSettingsPage::BookmarksSettingsPage(DolphinMainWindow* mainWindow,
+                                             QWidget*parent) :

     SettingsPageBase(parent),
     SettingsPageBase(parent),

+    m_mainWindow(mainWindow),

     m_addButton(0),
     m_removeButton(0),
     m_moveUpButton(0),
     m_moveDownButton(0)
 {
     m_addButton(0),
     m_removeButton(0),
     m_moveUpButton(0),
     m_moveDownButton(0)
 {

-    Q3VBoxLayout* topLayout = new Q3VBoxLayout(parent, 2, KDialog::spacingHint());
+    Q3VBoxLayout* topLayout = new Q3VBoxLayout(this, 2, KDialog::spacingHint());

 
     const int spacing = KDialog::spacingHint();
 
 
     const int spacing = KDialog::spacingHint();
 

-    Q3HBox* hBox = new Q3HBox(parent);
+    KHBox* hBox = new KHBox(this);

     hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     hBox->setSpacing(spacing);
     hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);
 
     hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     hBox->setSpacing(spacing);
     hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);
 

-    m_listView = new KListView(hBox);
+    m_listView = new K3ListView(hBox);

     m_listView->addColumn(i18n("Icon"));
     m_listView->addColumn(i18n("Name"));
     m_listView->addColumn(i18n("Location"));
     m_listView->addColumn(i18n("Icon"));
     m_listView->addColumn(i18n("Name"));
     m_listView->addColumn(i18n("Location"));


@@ -72,7 +75,7 @@ BookmarksSettingsPage::BookmarksSettingsPage(QWidget*parent) :
     connect(m_listView, SIGNAL(doubleClicked(Q3ListViewItem*, const QPoint&, int)),
             this, SLOT(slotBookmarkDoubleClicked(Q3ListViewItem*, const QPoint&, int)));
 
     connect(m_listView, SIGNAL(doubleClicked(Q3ListViewItem*, const QPoint&, int)),
             this, SLOT(slotBookmarkDoubleClicked(Q3ListViewItem*, const QPoint&, int)));
 

-    Q3VBox* buttonBox = new Q3VBox(hBox);
+    KVBox* buttonBox = new KVBox(hBox);

     buttonBox->setSpacing(spacing);
 
     const QSizePolicy buttonSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
     buttonBox->setSpacing(spacing);
 
     const QSizePolicy buttonSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);


@@ -117,7 +120,7 @@ BookmarksSettingsPage::BookmarksSettingsPage(QWidget*parent) :
         Q3ListViewItem* item = new Q3ListViewItem(m_listView);
         item->setPixmap(PixmapIdx, SmallIcon(bookmark.icon()));
         item->setText(NameIdx, bookmark.text());
         Q3ListViewItem* item = new Q3ListViewItem(m_listView);
         item->setPixmap(PixmapIdx, SmallIcon(bookmark.icon()));
         item->setText(NameIdx, bookmark.text());

-        item->setText(URLIdx, bookmark.url().prettyURL());
+        item->setText(UrlIdx, bookmark.url().prettyUrl());

 
         // add hidden column to be able to retrieve the icon name again
         item->setText(IconIdx, bookmark.icon());
 
         // add hidden column to be able to retrieve the icon name again
         item->setText(IconIdx, bookmark.icon());


@@ -156,7 +159,7 @@ void BookmarksSettingsPage::applySettings()
     while (item != 0) {
         root.addBookmark(manager,
                          item->text(NameIdx),
     while (item != 0) {
         root.addBookmark(manager,
                          item->text(NameIdx),

-                         KURL(item->text(URLIdx)),
+                         KUrl(item->text(UrlIdx)),

                          item->text(IconIdx)); // hidden column
         item = item->itemBelow();
     }
                          item->text(IconIdx)); // hidden column
         item = item->itemBelow();
     }


@@ -199,14 +202,14 @@ void BookmarksSettingsPage::slotAddButtonClicked()
 {
     KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add Bookmark"),
                                                          i18n("New bookmark"),
 {
     KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add Bookmark"),
                                                          i18n("New bookmark"),

-                                                         KURL(),
+                                                         KUrl(),

                                                          "bookmark");
     if (!bookmark.isNull()) {
         // insert bookmark into listview
         Q3ListViewItem* item = new Q3ListViewItem(m_listView);
         item->setPixmap(PixmapIdx, SmallIcon(bookmark.icon()));
         item->setText(NameIdx, bookmark.text());
                                                          "bookmark");
     if (!bookmark.isNull()) {
         // insert bookmark into listview
         Q3ListViewItem* item = new Q3ListViewItem(m_listView);
         item->setPixmap(PixmapIdx, SmallIcon(bookmark.icon()));
         item->setText(NameIdx, bookmark.text());

-        item->setText(URLIdx, bookmark.url().prettyURL());
+        item->setText(UrlIdx, bookmark.url().prettyUrl());

         item->setText(IconIdx, bookmark.icon());
         m_listView->insertItem(item);
 
         item->setText(IconIdx, bookmark.icon());
         m_listView->insertItem(item);
 


@@ -227,12 +230,12 @@ void BookmarksSettingsPage::slotEditButtonClicked()
 
     KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Edit Bookmark"),
                                                          item->text(NameIdx),
 
     KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Edit Bookmark"),
                                                          item->text(NameIdx),

-                                                         KURL(item->text(URLIdx)),
+                                                         KUrl(item->text(UrlIdx)),

                                                          item->text(IconIdx));
     if (!bookmark.isNull()) {
         item->setPixmap(PixmapIdx, SmallIcon(bookmark.icon()));
         item->setText(NameIdx, bookmark.text());
                                                          item->text(IconIdx));
     if (!bookmark.isNull()) {
         item->setPixmap(PixmapIdx, SmallIcon(bookmark.icon()));
         item->setText(NameIdx, bookmark.text());

-        item->setText(URLIdx, bookmark.url().prettyURL());
+        item->setText(UrlIdx, bookmark.url().prettyUrl());

         item->setText(IconIdx, bookmark.icon());
     }
 }
         item->setText(IconIdx, bookmark.icon());
     }
 }


@@ -297,19 +300,19 @@ void BookmarksSettingsPage::moveBookmark(int direction)
         pixmap = *(item->pixmap(0));
     }
     QString name(item->text(NameIdx));
         pixmap = *(item->pixmap(0));
     }
     QString name(item->text(NameIdx));

-    QString url(item->text(URLIdx));
+    QString url(item->text(UrlIdx));

     QString icon(item->text(IconIdx));
 
     if (selectedItem->pixmap(0) != 0) {
         item->setPixmap(PixmapIdx, *(selectedItem->pixmap(0)));
     }
     item->setText(NameIdx, selectedItem->text(NameIdx));
     QString icon(item->text(IconIdx));
 
     if (selectedItem->pixmap(0) != 0) {
         item->setPixmap(PixmapIdx, *(selectedItem->pixmap(0)));
     }
     item->setText(NameIdx, selectedItem->text(NameIdx));

-    item->setText(URLIdx, selectedItem->text(URLIdx));
+    item->setText(UrlIdx, selectedItem->text(UrlIdx));

     item->setText(IconIdx, selectedItem->text(IconIdx));
 
     selectedItem->setPixmap(PixmapIdx, pixmap);
     selectedItem->setText(NameIdx, name);
     item->setText(IconIdx, selectedItem->text(IconIdx));
 
     selectedItem->setPixmap(PixmapIdx, pixmap);
     selectedItem->setText(NameIdx, name);

-    selectedItem->setText(URLIdx, url);
+    selectedItem->setText(UrlIdx, url);

     selectedItem->setText(IconIdx, icon);
 
     m_listView->setSelected(item, true);
     selectedItem->setText(IconIdx, icon);
 
     m_listView->setSelected(item, true);