Hello community,
here is the log from the commit of package rekonq for openSUSE:Factory
checked in at Tue Oct 4 17:01:27 CEST 2011.
--------
--- openSUSE:Factory/rekonq/rekonq.changes 2011-09-23 12:44:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/rekonq/rekonq.changes 2011-09-28 21:53:17.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Sep 28 19:45:19 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to 0.7.92:
+ * Bugfix release
+- Spec file updates:
+ * Changed License: to GPL-2.0+.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
rekonq-0.7.90.tar.bz2
New:
----
rekonq-0.7.92.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rekonq.spec ++++++
--- /var/tmp/diff_new_pack.fQDXOw/_old 2011-10-04 17:01:23.000000000 +0200
+++ /var/tmp/diff_new_pack.fQDXOw/_new 2011-10-04 17:01:23.000000000 +0200
@@ -17,11 +17,11 @@
#
Name: rekonq
-Version: 0.7.90
+Version: 0.7.92
Release: 1
Summary: WebKit Based Web Browser for KDE4
-License: GPLv3
+License: GPL-2.0+
Url: http://rekonq.kde.org/
Group: Productivity/Networking/Web/Browsers
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
++++++ rekonq-0.7.90.tar.bz2 -> rekonq-0.7.92.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/CMakeLists.txt new/rekonq-0.7.92/CMakeLists.txt
--- old/rekonq-0.7.90/CMakeLists.txt 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/CMakeLists.txt 2011-09-20 23:53:08.000000000 +0200
@@ -7,7 +7,7 @@
# Informations to update before to release this package.
# rekonq info
-SET(REKONQ_VERSION "0.7.90" )
+SET(REKONQ_VERSION "0.7.92" )
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/mainview.cpp new/rekonq-0.7.92/src/mainview.cpp
--- old/rekonq-0.7.90/src/mainview.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/mainview.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -62,6 +62,7 @@
MainView::MainView(MainWindow *parent)
: KTabWidget(parent)
, m_widgetBar(new StackedUrlBar(this))
+ , m_originalWidthHint(0)
, m_addTabButton(0)
, m_currentTabIndex(0)
, m_parentWindow(parent)
@@ -114,6 +115,7 @@
m_addTabButton->setAutoRaise(true);
m_addTabButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
+ m_originalWidthHint = sizeHint().width();
}
@@ -186,13 +188,7 @@
ButtonInCorner = false;
}
- // detecting X position
- int newPosX = tabBarWidth;
- int tabWidthHint = tabBar()->tabSizeHint(0).width();
- if (tabWidthHint < sizeHint().width() / 4)
- newPosX = tabWidgetWidth - m_addTabButton->width();
-
- m_addTabButton->move(newPosX, 0);
+ m_addTabButton->move(tabBarWidth, 0);
}
}
@@ -332,6 +328,12 @@
}
+int MainView::originalWidthHint() const
+{
+ return m_originalWidthHint;
+}
+
+
void MainView::newTab()
{
WebView *w = newWebTab()->view();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/mainview.h new/rekonq-0.7.92/src/mainview.h
--- old/rekonq-0.7.90/src/mainview.h 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/mainview.h 2011-09-20 23:53:08.000000000 +0200
@@ -105,6 +105,8 @@
return m_recentlyClosedTabs;
}
+ int originalWidthHint() const;
+
Q_SIGNALS:
// current tab signals
void currentTitle(const QString &url);
@@ -187,6 +189,9 @@
QString m_loadingGitPath;
+ // The original width hint of the mainview for tabs width
+ int m_originalWidthHint;
+
// the new tab button
QToolButton *m_addTabButton;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/rekonq.kcfg new/rekonq-0.7.92/src/rekonq.kcfg
--- old/rekonq-0.7.90/src/rekonq.kcfg 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/rekonq.kcfg 2011-09-20 23:53:08.000000000 +0200
@@ -70,9 +70,6 @@
<entry name="searchEngine" type="Int">
<default>0</default>
</entry>
- <entry name="autoScroll" type="Bool">
- <default>true</default>
- </entry>
<entry name="smoothScrolling" type="Bool">
<default>true</default>
</entry>
@@ -129,6 +126,9 @@
<entry name="useFavicon" type="Bool">
<default>false</default>
</entry>
+ <entry name="middleClickAction" type="Int">
+ <default>2</default>
+ </entry>
<entry name="animatedTabHighlighting" type="Bool">
<default>true</default>
</entry>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/settings/settings_appearance.ui new/rekonq-0.7.92/src/settings/settings_appearance.ui
--- old/rekonq-0.7.90/src/settings/settings_appearance.ui 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/settings/settings_appearance.ui 2011-09-20 23:53:08.000000000 +0200
@@ -17,7 +17,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>0</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="tabFont">
<attribute name="title">
@@ -293,19 +293,6 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QCheckBox" name="kcfg_autoScroll">
- <property name="toolTip">
- <string>Toggle automatic scrolling on middle click in a web page</string>
- </property>
- <property name="text">
- <string>Auto-scroll on middle-click</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
<widget class="QCheckBox" name="kcfg_smoothScrolling">
<property name="toolTip">
<string>Scroll pages with an eye candy effect</string>
@@ -326,6 +313,36 @@
</widget>
</item>
<item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLabel" name="label_11">
+ <property name="text">
+ <string>Middle click should:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="kcfg_middleClickAction">
+ <item>
+ <property name="text">
+ <string>Auto-scroll</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Load Clipboard URL</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Do Nothing</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -346,11 +363,6 @@
</widget>
<customwidgets>
<customwidget>
- <class>KUrlRequester</class>
- <extends>QFrame</extends>
- <header>kurlrequester.h</header>
- </customwidget>
- <customwidget>
<class>KFontComboBox</class>
<extends>KComboBox</extends>
<header>kfontcombobox.h</header>
@@ -361,6 +373,11 @@
<header>kcombobox.h</header>
</customwidget>
<customwidget>
+ <class>KUrlRequester</class>
+ <extends>QFrame</extends>
+ <header>kurlrequester.h</header>
+ </customwidget>
+ <customwidget>
<class>KIntNumInput</class>
<extends>QWidget</extends>
<header>knuminput.h</header>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tabbar.cpp new/rekonq-0.7.92/src/tabbar.cpp
--- old/rekonq-0.7.90/src/tabbar.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tabbar.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -98,8 +98,8 @@
int buttonSize = view->addTabButton()->size().width();
int tabBarWidth = view->size().width() - buttonSize;
- int baseWidth = view->sizeHint().width() / baseWidthDivisor;
- int minWidth = view->sizeHint().width() / minWidthDivisor;
+ int baseWidth = view->originalWidthHint() / baseWidthDivisor;
+ int minWidth = view->originalWidthHint() / minWidthDivisor;
int w;
if (baseWidth * count() < tabBarWidth)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tests/findbar_test.cpp new/rekonq-0.7.92/src/tests/findbar_test.cpp
--- old/rekonq-0.7.90/src/tests/findbar_test.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tests/findbar_test.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,22 +1,27 @@
-/*
- * Copyright 2010 Andrea Diamantini
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tests/mainview_test.cpp new/rekonq-0.7.92/src/tests/mainview_test.cpp
--- old/rekonq-0.7.90/src/tests/mainview_test.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tests/mainview_test.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -2,8 +2,8 @@
*
* This file is a part of the rekonq project
*
-* Copyright 2008 Benjamin C. Meyer
-* Copyright 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008 by Benjamin C. Meyer
+* Copyright (C) 2009-2011 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tests/mainwindow_test.cpp new/rekonq-0.7.92/src/tests/mainwindow_test.cpp
--- old/rekonq-0.7.90/src/tests/mainwindow_test.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tests/mainwindow_test.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,22 +1,27 @@
-/*
- * Copyright 2010 Andrea Diamantini
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tests/networkaccessmanager_test.cpp new/rekonq-0.7.92/src/tests/networkaccessmanager_test.cpp
--- old/rekonq-0.7.90/src/tests/networkaccessmanager_test.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tests/networkaccessmanager_test.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,22 +1,27 @@
-/*
- * Copyright 2010 Andrea Diamantini
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tests/protocolhandler_test.cpp new/rekonq-0.7.92/src/tests/protocolhandler_test.cpp
--- old/rekonq-0.7.90/src/tests/protocolhandler_test.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tests/protocolhandler_test.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,23 +1,27 @@
-/*
- * Copyright 2010 Andrea Diamantini
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
-
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tests/sessionmanager_test.cpp new/rekonq-0.7.92/src/tests/sessionmanager_test.cpp
--- old/rekonq-0.7.90/src/tests/sessionmanager_test.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tests/sessionmanager_test.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,23 +1,27 @@
-/*
- * Copyright 2010 Andrea Diamantini
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
-
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tests/tabbar_test.cpp new/rekonq-0.7.92/src/tests/tabbar_test.cpp
--- old/rekonq-0.7.90/src/tests/tabbar_test.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tests/tabbar_test.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,22 +1,29 @@
-/*
- * Copyright 2008 Benjamin C. Meyer
- * Copyright 2008 Andrea Diamantini
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2008 by Benjamin C. Meyer
+* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
+
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tests/urlbar_test.cpp new/rekonq-0.7.92/src/tests/urlbar_test.cpp
--- old/rekonq-0.7.90/src/tests/urlbar_test.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tests/urlbar_test.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,22 +1,27 @@
-/*
- * Copyright 2010 Andrea Diamantini
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tests/walletbar_test.cpp new/rekonq-0.7.92/src/tests/walletbar_test.cpp
--- old/rekonq-0.7.90/src/tests/walletbar_test.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tests/walletbar_test.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,22 +1,27 @@
-/*
- * Copyright 2010 Andrea Diamantini
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tests/webpage_test.cpp new/rekonq-0.7.92/src/tests/webpage_test.cpp
--- old/rekonq-0.7.90/src/tests/webpage_test.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tests/webpage_test.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,22 +1,27 @@
-/*
- * Copyright 2010 Andrea Diamantini
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tests/websnap_test.cpp new/rekonq-0.7.92/src/tests/websnap_test.cpp
--- old/rekonq-0.7.90/src/tests/websnap_test.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tests/websnap_test.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,22 +1,27 @@
-/*
- * Copyright 2010 Andrea Diamantini
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tests/webtab_test.cpp new/rekonq-0.7.92/src/tests/webtab_test.cpp
--- old/rekonq-0.7.90/src/tests/webtab_test.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tests/webtab_test.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,22 +1,28 @@
-/*
- * Copyright 2010 Andrea Diamantini
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2008 by Benjamin C. Meyer
+* Copyright (C) 2009-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/tests/webview_test.cpp new/rekonq-0.7.92/src/tests/webview_test.cpp
--- old/rekonq-0.7.90/src/tests/webview_test.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/tests/webview_test.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,22 +1,27 @@
-/*
- * Copyright 2010 Andrea Diamantini
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/urlbar/urlbar.cpp new/rekonq-0.7.92/src/urlbar/urlbar.cpp
--- old/rekonq-0.7.90/src/urlbar/urlbar.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/urlbar/urlbar.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -433,24 +433,22 @@
void UrlBar::activateSuggestions(bool b)
{
- if (b)
+ if (b && _box.isNull())
{
- if (_box.isNull())
- {
- _box = new CompletionWidget(this);
- installEventFilter(_box.data());
- connect(_box.data(), SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), this, SLOT(activated(const KUrl &, Rekonq::OpenType)));
-
- // activate suggestions on edit text
- connect(this, SIGNAL(textChanged(const QString &)), this, SLOT(detectTypedString(const QString &)));
- }
+ _box = new CompletionWidget(this);
+ installEventFilter(_box.data());
+ connect(_box.data(), SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), this, SLOT(activated(const KUrl &, Rekonq::OpenType)));
+
+ // activate suggestions on edit text
+ connect(this, SIGNAL(textChanged(const QString &)), this, SLOT(detectTypedString(const QString &)));
+
+ return;
}
- else
- {
- disconnect(this, SIGNAL(textChanged(const QString &)), this, SLOT(detectTypedString(const QString &)));
- removeEventFilter(_box.data());
+
+ disconnect(this, SIGNAL(textChanged(const QString &)), this, SLOT(detectTypedString(const QString &)));
+ removeEventFilter(_box.data());
+ if (!_box.isNull())
_box.data()->deleteLater();
- }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/urlbar/webshortcutwidget.cpp new/rekonq-0.7.92/src/urlbar/webshortcutwidget.cpp
--- old/rekonq-0.7.90/src/urlbar/webshortcutwidget.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/urlbar/webshortcutwidget.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,23 +1,29 @@
-/* This file is part of the KDE project
- *
- * Copyright (C) 2009 by Fredy Yanardi
- * Copyright (C) 2010-2011 by Lionel Chauvin
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Fredy Yanardi
+* Copyright (C) 2010-2011 by Lionel Chauvin
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
+
// Self Includes
#include "webshortcutwidget.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/urlbar/webshortcutwidget.h new/rekonq-0.7.92/src/urlbar/webshortcutwidget.h
--- old/rekonq-0.7.90/src/urlbar/webshortcutwidget.h 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/urlbar/webshortcutwidget.h 2011-09-20 23:53:08.000000000 +0200
@@ -1,23 +1,29 @@
-/* This file is part of the KDE project
- *
- * Copyright (C) 2009 by Fredy Yanardi
- * Copyright (C) 2010-2011 by Lionel Chauvin
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Fredy Yanardi
+* Copyright (C) 2010-2011 by Lionel Chauvin
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
+
#ifndef WEBSHORTCUTWIDGET_H
#define WEBSHORTCUTWIDGET_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/websslinfo.cpp new/rekonq-0.7.92/src/websslinfo.cpp
--- old/rekonq-0.7.90/src/websslinfo.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/websslinfo.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -1,24 +1,28 @@
-/*
- * This file is part of the KDE project.
- *
- * Copyright (C) 2009 Dawit Alemayehu
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
+/* ============================================================
+*
+* This file is a part of the KDE project
+*
+* Copyright (C) 2009-2011 by Dawit Alemayehu
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
+
// Self Includes
#include "websslinfo.h"
@@ -26,6 +30,7 @@
// Qt Includes
#include
+
class WebSslInfo::WebSslInfoPrivate
{
public:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/websslinfo.h new/rekonq-0.7.92/src/websslinfo.h
--- old/rekonq-0.7.90/src/websslinfo.h 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/websslinfo.h 2011-09-20 23:53:08.000000000 +0200
@@ -1,24 +1,29 @@
-/*
- * This file is part of the KDE project.
- *
- * Copyright (C) 2009 Dawit Alemayehu
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
+/* ============================================================
+*
+* This file is a part of the KDE project
+*
+* Copyright (C) 2009-2011 by Dawit Alemayehu
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see http://www.gnu.org/licenses/.
+*
+* ============================================================ */
+
+
#ifndef WEBSSLINFO_H
#define WEBSSLINFO_H
@@ -30,6 +35,7 @@
#include
#include
+
class WebSslInfo
{
public:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/webtab.cpp new/rekonq-0.7.92/src/webtab.cpp
--- old/rekonq-0.7.90/src/webtab.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/webtab.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -85,7 +85,6 @@
}
connect(m_webView, SIGNAL(loadProgress(int)), this, SLOT(updateProgress(int)));
- connect(m_webView, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
connect(m_webView, SIGNAL(titleChanged(const QString &)), this, SIGNAL(titleChanged(const QString &)));
// Session Manager
@@ -120,15 +119,9 @@
}
-void WebTab::loadFinished(bool)
-{
- m_progress = 0;
-}
-
-
bool WebTab::isPageLoading()
{
- return m_progress != 0;
+ return m_progress != 0 && m_progress != 100;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/webtab.h new/rekonq-0.7.92/src/webtab.h
--- old/rekonq-0.7.90/src/webtab.h 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/webtab.h 2011-09-20 23:53:08.000000000 +0200
@@ -93,7 +93,6 @@
private Q_SLOTS:
void updateProgress(int progress);
- void loadFinished(bool);
void createWalletBar(const QString &, const QUrl &);
void showRSSInfo(const QPoint &pos);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rekonq-0.7.90/src/webview.cpp new/rekonq-0.7.92/src/webview.cpp
--- old/rekonq-0.7.90/src/webview.cpp 2011-09-18 23:53:07.000000000 +0200
+++ new/rekonq-0.7.92/src/webview.cpp 2011-09-20 23:53:08.000000000 +0200
@@ -376,7 +376,7 @@
}
QWebHitTestResult result = page()->mainFrame()->hitTestContent(event->pos());
- m_canEnableAutoScroll = ReKonfig::autoScroll() && !result.isContentEditable() && result.linkUrl().isEmpty();
+ m_canEnableAutoScroll = ReKonfig::middleClickAction() == 0 && !result.isContentEditable() && result.linkUrl().isEmpty();
switch (event->button())
{
@@ -403,7 +403,7 @@
}
}
- if (!ReKonfig::autoScroll())
+ if (ReKonfig::middleClickAction() == 1 && result.linkUrl().isEmpty() && !result.isContentEditable())
{
const QString clipboardContent = rApp->clipboard()->text();
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org