From ae7dcdc9cc0565932906690fabcbc746200efeca Mon Sep 17 00:00:00 2001 From: "zack%kde.org" Date: Mon, 6 Dec 2004 02:50:30 +0000 Subject: [PATCH] making the embedding example actually do something nice git-svn-id: svn://10.0.0.236/trunk@166292 18797224-902f-48f8-a5cc-f745e15eee43 --- .../embedding/browser/qt/tests/Makefile.in | 4 + mozilla/embedding/browser/qt/tests/back.png | Bin 0 -> 1523 bytes .../embedding/browser/qt/tests/fileopen.png | Bin 0 -> 1249 bytes .../embedding/browser/qt/tests/forward.png | Bin 0 -> 1537 bytes .../embedding/browser/qt/tests/mainwindow.cpp | 69 +++++++++++++++++- .../embedding/browser/qt/tests/mainwindow.h | 13 ++++ mozilla/embedding/browser/qt/tests/reload.png | Bin 0 -> 1450 bytes mozilla/embedding/browser/qt/tests/stop.png | Bin 0 -> 1498 bytes 8 files changed, 82 insertions(+), 4 deletions(-) create mode 100755 mozilla/embedding/browser/qt/tests/back.png create mode 100755 mozilla/embedding/browser/qt/tests/fileopen.png create mode 100755 mozilla/embedding/browser/qt/tests/forward.png create mode 100755 mozilla/embedding/browser/qt/tests/reload.png create mode 100755 mozilla/embedding/browser/qt/tests/stop.png diff --git a/mozilla/embedding/browser/qt/tests/Makefile.in b/mozilla/embedding/browser/qt/tests/Makefile.in index 31f5781ce79..8c6a42c004a 100644 --- a/mozilla/embedding/browser/qt/tests/Makefile.in +++ b/mozilla/embedding/browser/qt/tests/Makefile.in @@ -28,6 +28,8 @@ MOCSRCS = \ moc_mainwindow.cpp \ $(NULL) +IMAGES = fileopen.png reload.png back.png forward.png stop.png + CXXFLAGS += $(MOZ_QT_CFLAGS) PROGRAM = $(CPPSRCS:.cpp=) @@ -40,6 +42,7 @@ LIBS += \ endif include $(topsrcdir)/config/config.mk +include $(srcdir)/../src/config/qtconfig.mk # Force applications to be built non-statically # when building the mozcomps meta component @@ -64,6 +67,7 @@ EXTRA_LIBS += $(MOZ_JS_LIBS) EXTRA_LIBS += $(MOZ_COMPONENT_LIBS) include $(topsrcdir)/config/rules.mk +include $(srcdir)/../src/config/qtrules.mk CXXFLAGS += $(MOZ_QT_CFLAGS) diff --git a/mozilla/embedding/browser/qt/tests/back.png b/mozilla/embedding/browser/qt/tests/back.png new file mode 100755 index 0000000000000000000000000000000000000000..e8d11504c94363368a5351111fe986ada43ffea3 GIT binary patch literal 1523 zcmVrty-*d%VQgx!1nF%iKG2@64RT0}~X|1lqs!Y37{y z=J)^3InsCFQ)-~6>ye?pzK@R%55Dnf{{c|{UqYg<_e&kkd*2^TB;Nbh^Uov=MS1SC z7(7tNh6lCYj*d5zeFO66uY6zH3lnm7;te_4e@K27j()$%!$X70_D=r7VBf%zAD?-F zu125fbFX7XI&poKuC|U}tD068!Y_q%bw<QR=qa@l;bFkVwv`-7`9*XKTA zaCmqq?i7lbpMLany{Ate#!6t@Fp@+^P}n6*;oI|V7RmM#z=$K_miJ}hg>?##kb$X_Z{k+TZr!I zV0(Fzy*)i>p$JuL8^3DfRw@XuiYh(Y`iB^K=0(n*yTr@iJwr7TYtin&lZOtyv){{) zo;mX@TF7MlH*X&gVj9zM>>+BVmh*L4kGWO(>3Gn;w*+ozr+@z7x=e*0HEr%YXAJ*@*>)Hc_XUE3fU zk6{=preR{3A!_R5gd<^u=TWg8V!QXVxx9*-yM?9KbLqxHr+ze%{Gqh+UwNdriLn!h zx%iI{$fnY?_Z^_Nsh-uTc{b-)k-mqbLMWuNXI}%Z=i^v5w(DSo4eX+YT@~0>1uI|1 zu|ue;rs|#)FVx8@Uw-`aEKklb|IsW$3d)v)RC73%O}S9Qt$MhwN7b&NX&PqKz_BY- zDiwt1g95(mlFwNzUSDA+yqA!sSvn96g~KSK!p+GQBpSM|lHbZv+$ms&O@x$`trDeT z1;?qPD3WL_h88lAN(9YRiS07Tr8h~XGsGjUY-cj)A$?9)6|M`RG+&(Fp}nb=md*y! zOV@B+7rz2lp^WeQxUP>c6%|&Q4bkl%P6jRy=ArNW|DZ;qEic!~0 zXMcjtVwwELHY)Dx>ZPkw1)&*VoX>7Cm&vpH_*V&ck0H!@N)>@-Mvz*Vva7P=NQ$0; zA8)3l*FsYdM*9$Y{XTXz?W3_bNu+InBDW?>qsD`-McXXX*nA~gqkNj~-@$&+8ejK@GiYGn;w*AOWD{oGluO;yI*lOrrQz)R2K^#AzEnNvV)QR4g*9iM)%lk$OwRn`zRm8~@W7EU{<-eY^O7{Cy!BbEM9r> zIr7E)Ur^L>Ro899G{TyqqUxb#DY-B;znFSJ_x`u)YIZetv^JkVksOpSfAf_5^Pk?4 zSLaf4M@sqO)QTMIJ19-V=>DIOKzFae0OEiEasah8vG3JI!l&c9(lDGn&SOt}jn&0# zoIU${|LW4p!@v&E2)KX~Jj*}@NZ)I)HwZ5R)g_> zR-gn`*8(+w465G)v;@X?wowUyr6BC!n*Zp8zb8k~u|EB{W&Abg-26eR8i Z{R?`wnj_hO0x19h002ovPDHLkV1jtg|EmB1 literal 0 HcmV?d00001 diff --git a/mozilla/embedding/browser/qt/tests/fileopen.png b/mozilla/embedding/browser/qt/tests/fileopen.png new file mode 100755 index 0000000000000000000000000000000000000000..667d2fe2aaf41b359361c8be48f75460fa6a3d57 GIT binary patch literal 1249 zcmV<71Rnc|P)9{sfk8kL6P830^(KiL6K`G!@u1>=;K_I}#F!Y2 zCpE|cP(;y#28hB8vW(0CL$mbIOLbRuS65fp;=#tW%z#UbFZt#DUcFb}_j~oKQt%(N zp}`%AyUhvz7MfkW?ZH%9eW^F2zhKpkq1=rBZ2snv{dcaD|0#I&*v?m%EL*fojfyLS zFhmpubW7&ag~{iEd4j*SgPxx4(&*Bj*B^a+#qMZQ>bY?}N3~kTs+qK$7RgjMZX?W9 z%ay~$Th6f?H;#Vtw*})*zOw6y@l|gly6G!drYV-@FwGje8e?E^F)LP%F)%bhwVJ15 z7Wn4i*SAie{4#U<{&|mR&DiFheIv_0%;oY^qoWV>_4X$-m#&_na4S!}ZWD>X z8#ivGY?PUvnZ`74plMN-^)Bal{6xN!_b0)YEzf6n4W# z78J(DHn48pIFb}F`ODA9a)iO5VI0S%R4kIq)hNyt3-bj11J6Y68_`b=FMnv&?B(;= z4I4oSvFj#vtHE$~1>@^CAjxofb{b97NhG^5Et69}ouE>!Fwmc2Ak&W?jWy>9q7g?H z#n!6gtsKpkLl_2_6$3SrVAJNU3}=UE*d+pArYqHrX;!$FyGp%QMOCA$e&jJUO{G}O zV_9{1p5W5#5j&b(f1uIh?C^b`npGtT1=g&6n(p2>O{YQ-2vjWtD>sYhx%Bt-ksZ#W zX&M!y$jrSPCrP-`4>J*5bgJwf}zh)U2r6QF|g{D&{lj$dw?m|-} z#IS`Dk%%XvxV}%JRHEfJs9Od?7?RD7FgV;d+}pEVTu_kKg}p-PVcRu~VgbjtXf_=} zuZ8D%w0v+qpF+{VGz_AuL@Jday=W1F7!vpvaV=&RiU)%Q1*gt^o0kINFrtX>x3H`V zp6lU-0fHzY3L!10PCBl!bTms(Z!dw@#3)`z3Y!Q`ftl&XYYU#iAI2c|jznW?5PHjW0VRI`h>nqxsYe- z{DmWD&rIyPa^>vVzXIP=U{tP7M0ELwL^3_@x;|1EF~0cxvzKS4Cl0ii2tcGG2MF5{ zboO`t45#7E*00000 LNkvXXu0mjf^W9;t literal 0 HcmV?d00001 diff --git a/mozilla/embedding/browser/qt/tests/forward.png b/mozilla/embedding/browser/qt/tests/forward.png new file mode 100755 index 0000000000000000000000000000000000000000..418e5d74b774b813be40e3085c226e3706e67cc1 GIT binary patch literal 1537 zcmV+c2LAbpP)h=c};T7fE%f&@|}D2VnUPdpS}ScH_8 zqVUA}0#bqU5~NbGh)M`0RZ<$qb(?xTj`z56YR|;mc-C*dJn$6?IEWnSNJm%qznpue zbKoB0$jHGLM+XPr8P4TS{l6G_F9MwhGB1Dr$untPmtQPzZavQ-vAhzXV1H z2ftw$mFGWu<}-Zxt6w1$G1)Aw5D0><+e9Mmq%#k)vT~V~<#`qt*H~Iwp`#>S|y_g>_WzrVN=iNwaI^7);A3XBa8Cmp-KeeV48eCpGu_{(2^&EotFO6dq82?PS@ zdXQkK1=lfIy}7`BnIX!1Yiw;70Usw%o}i;6#j{^~fu;HKawHPHe{wpn0Aw;2`|i=> zW5+-Dh0|QP@IwkSOEemixw&Q5){3mH6}fryU1nzs6pNcQjRtM0AOnK~`29M?Vu`uA zCHneuj2+H#JW}lil6f-V^Jk(ywGkGWGRb ze>M^bTa-$B_JG8gA;`ax*_3ka2 zO`8+P$C+PP;P%>9Ur)BnCo}Es&m>!e$#SK{?sk<}tc7NC7a;_$>!N8I3XO8PLbcMs zFf5vefnk`KriEqM)M|Aql{#CSWdZ^CP+yj7R|_b|*CVr;j!z0{^~YKQtgfsPiUdit zq|lJKuE4f!DwR6h+hr=%22I1nbrk@Pbu0^Vcwov#kPd03n7+w z_bgI&jFwav#XD6RhCtIC9IKA5OTwWDj_n|%j%hkk=VA2uWAAho)O& z;_VG=8-&p2Wj5VWM9HVK_m9#u@Bo#)DvgGV?P}N#ShhveP}J)t^;(tk?jE-Dj}Dqf zgJ#p9R;kfw*lg@J(EJCOzrIX$r>caMO-RGxXYao4b+B!!__l~nVdz00|4TO}BO-|>hbpW5=|J363 z$$W0)AwKcMmk>f>+cupCx{y+%QL8fX#zn5a_GdQN7f7}xh=k)HBr@QT=^i59*2(hB zbyf=3L273w^E0ph+bsIX$ib)DJ99rzclV;}8kS`ejfM$^eB77qMfWENBwCp({0+^m z<2ViqL2vF5N)IwKafusmypCzuXC~gs|90PLI@+J>K;x)uTYawUVj5=Cah)Kzr=qd= z6W{#NOGJ}x+$cNEEivSiCc4p9m`UWP3C8>-feW>HT=5l92?51OK&Zz z9i`Oda!Fly^^$t}>{)eed{pJK>8maAXnH@a{(-t32m)ci=hZr}W7d1+eF31yK9$WY1O5`wQs- nHBa#UeE**C+*?5PKZ*Vh1qFvKncpx|00000NkvXXu0mjfMd$V& literal 0 HcmV?d00001 diff --git a/mozilla/embedding/browser/qt/tests/mainwindow.cpp b/mozilla/embedding/browser/qt/tests/mainwindow.cpp index 851cfae7111..88c1f90e63d 100644 --- a/mozilla/embedding/browser/qt/tests/mainwindow.cpp +++ b/mozilla/embedding/browser/qt/tests/mainwindow.cpp @@ -1,28 +1,50 @@ #include "mainwindow.h" +#include #include #include #include #include #include -#include +#include +#include #include "qgeckoembed.h" MyMainWindow::MyMainWindow() { - QHBox *box = new QHBox(this); + QVBox *box = new QVBox(this); qecko = new QGeckoEmbed(box, "qgecko"); box->setFrameStyle(QFrame::Panel | QFrame::Sunken); setCentralWidget( box ); - //QToolBar *toolbar = new QToolBar(this); + QToolBar *toolbar = new QToolBar(this); + toolbar->setLabel("Location:"); + + QAction *action = new QAction(QPixmap::fromMimeSource( "back.png" ), tr( "Go Back"), CTRL + Key_B, + toolbar, "goback"); + connect(action, SIGNAL(activated()), this, SLOT(goBack())); + action->addTo(toolbar); + + action = new QAction(QPixmap::fromMimeSource( "forward.png" ), tr( "Go Forward"), CTRL + Key_F, + toolbar, "goforward"); + connect(action, SIGNAL(activated()), this, SLOT(goForward())); + action->addTo(toolbar); + + action = new QAction(QPixmap::fromMimeSource( "stop.png" ), tr("Stop"), CTRL + Key_S, + toolbar, "stop"); + connect(action, SIGNAL(activated()), this, SLOT(stopLoad())); + action->addTo(toolbar); + + location = new QLineEdit(toolbar); + toolbar->setStretchableWidget(location); QPopupMenu *menu = new QPopupMenu(this); menuBar()->insertItem( tr( "&File" ), menu ); - QAction *a = new QAction( QPixmap::fromMimeSource( "filenew.xpm" ), tr( "&Open..." ), CTRL + Key_O, this, "fileOpen" ); + QAction *a = new QAction( QPixmap::fromMimeSource( "fileopen.png" ), tr( "&Open..." ), CTRL + Key_O, + toolbar, "fileOpen" ); connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); //a->addTo( toolbar ); a->addTo( menu ); @@ -36,6 +58,15 @@ MyMainWindow::MyMainWindow() SLOT(setCaption(const QString &)) ); connect( qecko, SIGNAL(startURIOpen(const QString &, bool &)), SLOT(startURIOpen(const QString &, bool &)) ); + connect(qecko, SIGNAL(locationChanged(const QString&)), + location, SLOT(setText(const QString&))); + connect(qecko, SIGNAL(progress(int, int)), + SLOT(slotProgress(int, int))); + connect(qecko, SIGNAL(progressAll(const QString&, int, int)), + SLOT(slotProgress(const QString&, int, int))); + + + connect( location, SIGNAL(returnPressed()), SLOT(changeLocation())); } @@ -50,3 +81,33 @@ void MyMainWindow::startURIOpen(const QString &, bool &) { qDebug("XX in the signal"); } + +void MyMainWindow::changeLocation() +{ + qecko->loadURL( location->text() ); +} + +void MyMainWindow::goBack() +{ + qecko->goBack(); +} + +void MyMainWindow::goForward() +{ + qecko->goForward(); +} + +void MyMainWindow::stop() +{ + qecko->stopLoad(); +} + +void MyMainWindow::slotProgress(const QString &url, int current, int max) +{ + qDebug("progress %d / %d (%s)", current, max, url.latin1()); +} + +void MyMainWindow::slotProgress(int current, int max) +{ + qDebug("progress %d / %d ", current, max); +} diff --git a/mozilla/embedding/browser/qt/tests/mainwindow.h b/mozilla/embedding/browser/qt/tests/mainwindow.h index 8cce176ea00..4b9a5b3582f 100644 --- a/mozilla/embedding/browser/qt/tests/mainwindow.h +++ b/mozilla/embedding/browser/qt/tests/mainwindow.h @@ -4,6 +4,7 @@ #include class QGeckoEmbed; +class QLineEdit; class MyMainWindow : public QMainWindow { @@ -14,8 +15,20 @@ public: public slots: void fileOpen(); void startURIOpen(const QString &, bool &); + void changeLocation(); + void goBack(); + void goForward(); + void stop(); + public: QGeckoEmbed *qecko; + +private slots: + void slotProgress(int, int); + void slotProgress(const QString &, int, int); + +private: + QLineEdit *location; }; #endif diff --git a/mozilla/embedding/browser/qt/tests/reload.png b/mozilla/embedding/browser/qt/tests/reload.png new file mode 100755 index 0000000000000000000000000000000000000000..a1243d01743ec7ed63fd65d7b45c56f14356b9ac GIT binary patch literal 1450 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 AO#lD@ literal 0 HcmV?d00001