From 6f4e236e6e75b9aa2190f1c27a153d5628100bb3 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Mon, 30 Dec 2013 11:31:19 +0100
Subject: [PATCH] [BookmarksImport] Show InternetExplorer only on Windows

---
 CHANGELOG                                      |  1 +
 .../bookmarksimport/bookmarksimportdialog.cpp  |  4 ++++
 .../bookmarksimport/bookmarksimportdialog.h    |  2 +-
 .../bookmarksimport/bookmarksimportdialog.ui   | 18 +++++++++---------
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b6e30952a..225da46a9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ Version 1.5.0
     * added StatusBar Icons plugin that adds extra icons to statusbar
     * added support for POST method in search engines manager
     * added context menu for translating webpage
+    * added possibility to export bookmarks to html file
     * great performance improvement for matching basic rules in AdBlock
     * themes can now be loaded from profile directories
     * pagescreen can now save output into number of formats, including PDF
diff --git a/src/lib/bookmarksimport/bookmarksimportdialog.cpp b/src/lib/bookmarksimport/bookmarksimportdialog.cpp
index 0adbfed10..02b450338 100644
--- a/src/lib/bookmarksimport/bookmarksimportdialog.cpp
+++ b/src/lib/bookmarksimport/bookmarksimportdialog.cpp
@@ -45,6 +45,10 @@ BookmarksImportDialog::BookmarksImportDialog(QWidget* parent)
 
     ui->browserList->setCurrentRow(0);
 
+#ifndef Q_OS_WIN
+    ui->browserList->setItemHidden(ui->browserList->item(IE), true);
+#endif
+
     connect(ui->nextButton, SIGNAL(clicked()), this, SLOT(nextPage()));
     connect(ui->chooseFile, SIGNAL(clicked()), this, SLOT(setFile()));
     connect(ui->cancelButton, SIGNAL(clicked()), this, SLOT(close()));
diff --git a/src/lib/bookmarksimport/bookmarksimportdialog.h b/src/lib/bookmarksimport/bookmarksimportdialog.h
index 9c4978808..5bfed574b 100644
--- a/src/lib/bookmarksimport/bookmarksimportdialog.h
+++ b/src/lib/bookmarksimport/bookmarksimportdialog.h
@@ -51,7 +51,7 @@ private slots:
     void loadFinished();
 
 private:
-    enum Browser { Firefox = 0, Chrome = 1, Opera = 2, Html = 3, IE = 4};
+    enum Browser { Firefox = 0, Chrome = 1, Opera = 2, IE = 3, Html = 4};
 
     void setupBrowser(Browser browser);
     bool exportedOK();
diff --git a/src/lib/bookmarksimport/bookmarksimportdialog.ui b/src/lib/bookmarksimport/bookmarksimportdialog.ui
index e6ad010fd..cbc5f6c76 100644
--- a/src/lib/bookmarksimport/bookmarksimportdialog.ui
+++ b/src/lib/bookmarksimport/bookmarksimportdialog.ui
@@ -69,15 +69,6 @@
             <normaloff>:/icons/browsers/opera.png</normaloff>:/icons/browsers/opera.png</iconset>
           </property>
          </item>
-         <item>
-          <property name="text">
-           <string>From File</string>
-          </property>
-          <property name="icon">
-           <iconset resource="../data/icons.qrc">
-            <normaloff>:/icons/browsers/html.png</normaloff>:/icons/browsers/html.png</iconset>
-          </property>
-         </item>
          <item>
           <property name="text">
            <string>Internet Explorer</string>
@@ -87,6 +78,15 @@
             <normaloff>:/icons/browsers/internet-explorer.png</normaloff>:/icons/browsers/internet-explorer.png</iconset>
           </property>
          </item>
+         <item>
+          <property name="text">
+           <string>From File</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../data/icons.qrc">
+            <normaloff>:/icons/browsers/html.png</normaloff>:/icons/browsers/html.png</iconset>
+          </property>
+         </item>
         </widget>
        </item>
        <item row="0" column="0" colspan="3">