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

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror
From:       David Faure <faure () kde ! org>
Date:       2010-03-03 12:10:31
Message-ID: 1267618231.366282.16919.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1098277 by dfaure:

Forwardport r1098275:
Port web_module away from QT3_SUPPORT.
Move QT3_SUPPORT define (oops, had no idea it was still there) into the only dir that \
still needs it.


 M  +0 -2      CMakeLists.txt  
 M  +2 -0      sidebar/trees/CMakeLists.txt  
 M  +56 -7     sidebar/web_module/web_module.cpp  
 M  +4 -34     sidebar/web_module/web_module.h  


--- trunk/KDE/kdebase/apps/konqueror/CMakeLists.txt #1098276:1098277
@@ -1,8 +1,6 @@
 
 add_definitions(-D_LARGEFILE64_SOURCE )
 
-add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
 add_subdirectory( src )
 add_subdirectory( client )
 
--- trunk/KDE/kdebase/apps/konqueror/sidebar/trees/CMakeLists.txt #1098276:1098277
@@ -9,6 +9,8 @@
 kde4_add_library(sidebar_tree STATIC ${libkonq_sidebar_tree_SRCS})
 endif(WIN32)
 
+add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
+
 add_subdirectory( init )
 add_subdirectory( dirtree_module )
 add_subdirectory( bookmark_module )
--- trunk/KDE/kdebase/apps/konqueror/sidebar/web_module/web_module.cpp \
#1098276:1098277 @@ -17,6 +17,7 @@
 */
 
 #include "web_module.h"
+#include <kaction.h>
 #include "favicon_interface.h"
 
 #include <QtCore/QFileInfo>
@@ -35,6 +36,52 @@
 #include <khbox.h>
 
 
+KHTMLSideBar::KHTMLSideBar()
+    : KHTMLPart()
+{
+    setStatusMessagesEnabled(false);
+    setMetaRefreshEnabled(true);
+    setJavaEnabled(false);
+    setPluginsEnabled(false);
+
+    setFormNotification(KHTMLPart::Only);
+    connect(this,
+            SIGNAL(formSubmitNotification(const \
char*,QString,QByteArray,QString,QString,QString)), +            this,
+            SLOT(formProxy(const char*,QString,QByteArray,QString,QString,QString))
+        );
+
+
+    _linkMenu = new KMenu(widget());
+
+    KAction* openLinkAction = new KAction(i18n("&Open Link"), this);
+    _linkMenu->addAction(openLinkAction);
+    connect(openLinkAction, SIGNAL(triggered()), this, SLOT(loadPage()));
+
+    KAction* openWindowAction = new KAction(i18n("Open in New &Window"), this);
+    _linkMenu->addAction(openWindowAction);
+    connect(openWindowAction, SIGNAL(triggered()), this, SLOT(loadNewWindow()));
+
+
+    _menu = new KMenu(widget());
+
+    KAction* reloadAction = new KAction(i18n("&Reload"), this);
+    reloadAction->setIcon(KIcon("view-refresh"));
+    _menu->addAction(reloadAction);
+    connect(reloadAction, SIGNAL(triggered()), this, SIGNAL(reload()));
+
+    KAction* autoReloadAction = new KAction(i18n("Set &Automatic Reload"), this);
+    autoReloadAction->setIcon(KIcon("view-refresh"));
+    _menu->addAction(autoReloadAction);
+    connect(autoReloadAction, SIGNAL(triggered()), this, SIGNAL(setAutoReload()));
+
+    connect(this, SIGNAL(popupMenu(QString,QPoint)),
+            this, SLOT(showMenu(QString,QPoint)));
+
+}
+
+////
+
 KonqSideBarWebModule::KonqSideBarWebModule(const KComponentData &componentData, \
QWidget *parent, const KConfigGroup& configGroup)  : KonqSidebarModule(componentData, \
parent, configGroup)  {
@@ -43,9 +90,9 @@
 	connect(_htmlPart, SIGNAL(reload()), this, SLOT(reload()));
 	connect(_htmlPart, SIGNAL(completed()), this, SLOT(pageLoaded()));
 	connect(_htmlPart,
-		SIGNAL(setWindowCaption(const QString&)),
+		SIGNAL(setWindowCaption(QString)),
 		this,
-		SLOT(setTitle(const QString&)));
+		SLOT(setTitle(QString)));
 	connect(_htmlPart,
 		SIGNAL(openUrlRequest(QString, KParts::OpenUrlArguments, \
KParts::BrowserArguments)),  this,
@@ -61,9 +108,9 @@
 		this,
 		SLOT(urlNewWindow(QString,KParts::OpenUrlArguments,KParts::BrowserArguments,KParts::WindowArgs)));
  connect(_htmlPart,
-		SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const \
QString&,const QString&,const QString&)), +		SIGNAL(submitFormRequest(const \
char*,QString,const QByteArray&,QString,QString,QString)),  this,
-		SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const \
QString&,const QString&,const QString&))); +		SIGNAL(submitFormRequest(const \
char*,QString,const QByteArray&,QString,QString,QString)));  
         reloadTimeout = configGroup.readEntry("Reload", 0);
 	_url = configGroup.readPathEntry("URL", QString());
@@ -83,7 +130,8 @@
 	return _htmlPart->widget();
 }
 
-void KonqSideBarWebModule::setAutoReload(){
+void KonqSideBarWebModule::setAutoReload()
+{
 	KDialog dlg( 0 );
   dlg.setModal( true );
   dlg.setCaption( i18n("Set Refresh Timeout (0 disables)" ) );
@@ -92,10 +140,11 @@
 	KHBox *hbox = new KHBox( &dlg );
   dlg.setMainWidget( hbox );
 
-	QSpinBox *mins = new QSpinBox( hbox );
+	QSpinBox *mins = new QSpinBox(hbox);
 	mins->setRange(0, 120);
 	mins->setSuffix( i18n(" min") );
-	QSpinBox *secs = new QSpinBox( 0, 59, 1, hbox );
+	QSpinBox *secs = new QSpinBox(hbox);
+        secs->setRange(0, 59);
 	secs->setSuffix( i18n(" sec") );
 
 	if( reloadTimeout > 0 )	{
--- trunk/KDE/kdebase/apps/konqueror/sidebar/web_module/web_module.h #1098276:1098277
@@ -31,41 +31,11 @@
 // A wrapper for KHTMLPart to make it behave the way we want it to.
 class KHTMLSideBar : public KHTMLPart
 {
-	Q_OBJECT
-	public:
-		KHTMLSideBar() : KHTMLPart() {
-			setStatusMessagesEnabled(false);
-			setMetaRefreshEnabled(true);
-			setJavaEnabled(false);
-			setPluginsEnabled(false);
+    Q_OBJECT
+public:
+    KHTMLSideBar();
+    virtual ~KHTMLSideBar() {}
 
-			setFormNotification(KHTMLPart::Only);
-			connect(this,
-				SIGNAL(formSubmitNotification(const char*,const QString&,const QByteArray&,const \
                QString&,const QString&,const QString&)),
-				this,
-				SLOT(formProxy(const char*,const QString&,const QByteArray&,const QString&,const \
                QString&,const QString&))
-				);
-
-
-			_linkMenu = new KMenu(widget());
-
-                        _linkMenu->insertItem(i18n("&Open Link"),
-                                              this, SLOT(loadPage()));
-                        _linkMenu->insertItem(i18n("Open in New &Window"),
-                                              this, SLOT(loadNewWindow()));
-			_menu = new KMenu(widget());
-			_menu->insertItem(SmallIcon("view-refresh"), i18n("&Reload"),
-					this, SIGNAL(reload()));
-			_menu->insertItem(SmallIcon("view-refresh"), i18n("Set &Automatic Reload"),       \
                this, SIGNAL(setAutoReload()));
-
-			connect(this,
-				SIGNAL(popupMenu(const QString&,const QPoint&)),
-				this,
-				SLOT(showMenu(const QString&, const QPoint&)));
-
-		}
-		virtual ~KHTMLSideBar() {}
-
 	Q_SIGNALS:
 		void submitFormRequest(const char*,const QString&,const QByteArray&,const \
QString&,const QString&,const QString&);  void openUrlRequest(const QString& url,


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