Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26:34 +01:00
Code Releases Activity

[BookmarksImport] Show InternetExplorer only on Windows

Browse Source
This commit is contained in:
nowrep 2013-12-30 11:31:19 +01:00
parent c27b10ed4e
commit 6f4e236e6e
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -11,6 +11,7 @@ Version 1.5.0
* added StatusBar Icons plugin that adds extra icons to statusbar * added StatusBar Icons plugin that adds extra icons to statusbar
* added support for POST method in search engines manager * added support for POST method in search engines manager
* added context menu for translating webpage * added context menu for translating webpage
* added possibility to export bookmarks to html file
* great performance improvement for matching basic rules in AdBlock * great performance improvement for matching basic rules in AdBlock
* themes can now be loaded from profile directories * themes can now be loaded from profile directories
* pagescreen can now save output into number of formats, including PDF * pagescreen can now save output into number of formats, including PDF

4
src/lib/bookmarksimport/bookmarksimportdialog.cpp
View File

@ -45,6 +45,10 @@ BookmarksImportDialog::BookmarksImportDialog(QWidget* parent)
ui->browserList->setCurrentRow(0); 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->nextButton, SIGNAL(clicked()), this, SLOT(nextPage()));
connect(ui->chooseFile, SIGNAL(clicked()), this, SLOT(setFile())); connect(ui->chooseFile, SIGNAL(clicked()), this, SLOT(setFile()));
connect(ui->cancelButton, SIGNAL(clicked()), this, SLOT(close())); connect(ui->cancelButton, SIGNAL(clicked()), this, SLOT(close()));

2
src/lib/bookmarksimport/bookmarksimportdialog.h
View File

@ -51,7 +51,7 @@ private slots:
void loadFinished(); void loadFinished();
private: 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); void setupBrowser(Browser browser);
bool exportedOK(); bool exportedOK();

18
src/lib/bookmarksimport/bookmarksimportdialog.ui
View File

@ -69,15 +69,6 @@
<normaloff>:/icons/browsers/opera.png</normaloff>:/icons/browsers/opera.png</iconset> <normaloff>:/icons/browsers/opera.png</normaloff>:/icons/browsers/opera.png</iconset>
</property> </property>
</item> </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> <item>
<property name="text"> <property name="text">
<string>Internet Explorer</string> <string>Internet Explorer</string>
@ -87,6 +78,15 @@
<normaloff>:/icons/browsers/internet-explorer.png</normaloff>:/icons/browsers/internet-explorer.png</iconset> <normaloff>:/icons/browsers/internet-explorer.png</normaloff>:/icons/browsers/internet-explorer.png</iconset>
</property> </property>
</item> </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> </widget>
</item> </item>
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">