From konq-e Fri Jun 08 13:27:37 2001 From: Arnaud Rolly Date: Fri, 08 Jun 2001 13:27:37 +0000 To: konq-e Subject: Patches: kiosk gui support X-MARC-Message: https://marc.info/?l=konq-e&m=99200681113744 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--------------070504070405040307060908" This is a multi-part message in MIME format. --------------070504070405040307060908 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Here's patches to add the kiosk support. Basically, the changes are : - kiosk gui support in configure.in.in - addition of mainwindow_kiosk.cc (file content will be changed later) - conditional include of mainwindow_kiosk.cc in mainwindow.cc - move of popupMenu from mainwindow.cc to mainwindow_*.cc (I will think of the kconfig use when the others features will be ok) - Disable MainWindow borders if the gui is kiosk (must be done in the constructor, cannot put it in mainwindow_kiosk.cc) --------------070504070405040307060908 Content-Type: text/plain; name="patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch" Only in anfora: Makefile.in Only in anfora: acinclude.m4 Only in anfora: aclocal.m4 Only in anfora: config.h.in Only in anfora: configure Only in anfora: configure.files Only in anfora: configure.in diff -wcbBr kdenox/configure.in.in anfora/configure.in.in *** kdenox/configure.in.in Thu Jun 7 17:34:57 2001 --- anfora/configure.in.in Fri Jun 8 14:27:37 2001 *************** *** 36,41 **** --- 36,42 ---- UIC_NOT_NEEDED=true + dnl QT/Embedded support AC_ARG_ENABLE(qt-embedded,[ --enable-qt-embedded Enable Qt Embedded support (adds -fno-rtti and -DQWS)], want_qte=$enableval,want_qte=no) *************** *** 63,68 **** --- 64,70 ---- AC_PATH_QT fi + dnl QT Palmtop Environment (QPE) support AC_ARG_ENABLE(qpe,[ --enable-qpe Enable support for the Qt Palmtop Environment], want_qpe=$enableval,want_qpe=no) *************** *** 101,107 **** ac_konqe_gui="qpe"; fi ! AC_ARG_WITH(gui,[ --with-gui=TYPE where TYPE can be of x11 or qpe. default is x11], [ ac_konqe_gui="$withval" ]) --- 103,109 ---- ac_konqe_gui="qpe"; fi ! AC_ARG_WITH(gui,[ --with-gui=TYPE where TYPE can be of x11, qpe or kiosk. default is x11], [ ac_konqe_gui="$withval" ]) *************** *** 117,122 **** --- 119,127 ---- ;; qpe) AC_DEFINE_UNQUOTED(KONQ_GUI_QPE, 1, [use qpe gui]) + ;; + kiosk) + AC_DEFINE_UNQUOTED(KONQ_GUI_KIOSK, 1, [use kiosk gui]) ;; esac Only in anfora/konq-embed: Makefile.in Only in anfora/konq-embed/dropin: Makefile.in Only in anfora/konq-embed/dropin/khtml: Makefile.in Only in anfora/konq-embed/dropin/khtml/java: Makefile.in Only in anfora/konq-embed/dropin/kio: Makefile.in Only in anfora/konq-embed/dropin/kparts: Makefile.in Only in anfora/konq-embed/dropin/kssl: Makefile.in Only in anfora/konq-embed/kdesrc: Makefile.in Only in anfora/konq-embed/kdesrc/kdecore: Makefile.in Only in anfora/konq-embed/kdesrc/kdecore: charsets Only in anfora/konq-embed/kdesrc/kdecore: kcharsets.cpp Only in anfora/konq-embed/kdesrc/kdecore: kcharsets.h Only in anfora/konq-embed/kdesrc/kdecore: kdatastream.h Only in anfora/konq-embed/kdesrc/kdecore: kentities.c Only in anfora/konq-embed/kdesrc/kdecore: kextsock.cpp Only in anfora/konq-embed/kdesrc/kdecore: kextsock.h Only in anfora/konq-embed/kdesrc/kdecore: kmdcodec.cpp Only in anfora/konq-embed/kdesrc/kdecore: kmdcodec.h Only in anfora/konq-embed/kdesrc/kdecore: krfcdate.cpp Only in anfora/konq-embed/kdesrc/kdecore: krfcdate.h Only in anfora/konq-embed/kdesrc/kdecore: ksavefile.cpp Only in anfora/konq-embed/kdesrc/kdecore: ksavefile.h Only in anfora/konq-embed/kdesrc/kdecore: ksharedptr.h Only in anfora/konq-embed/kdesrc/kdecore: ksock.cpp Only in anfora/konq-embed/kdesrc/kdecore: ksock.h Only in anfora/konq-embed/kdesrc/kdecore: ksockaddr.cpp Only in anfora/konq-embed/kdesrc/kdecore: ksockaddr.h Only in anfora/konq-embed/kdesrc/kdecore: kstddirs.cpp Only in anfora/konq-embed/kdesrc/kdecore: kstddirs.h Only in anfora/konq-embed/kdesrc/kdecore: ktempfile.cpp Only in anfora/konq-embed/kdesrc/kdecore: ktempfile.h Only in anfora/konq-embed/kdesrc/kdecore: kurl.cpp Only in anfora/konq-embed/kdesrc/kdecore: kurl.h Only in anfora/konq-embed/kdesrc/kdecore: netsupp.cpp Only in anfora/konq-embed/kdesrc/kdecore: netsupp.h Only in anfora/konq-embed/kdesrc/khtml: Makefile.in Only in anfora/konq-embed/kdesrc/khtml: css Only in anfora/konq-embed/kdesrc/khtml: design.h Only in anfora/konq-embed/kdesrc/khtml: dom Only in anfora/konq-embed/kdesrc/khtml: domtreeview.cpp Only in anfora/konq-embed/kdesrc/khtml: domtreeview.h Only in anfora/konq-embed/kdesrc/khtml: ecma Only in anfora/konq-embed/kdesrc/khtml: html Only in anfora/konq-embed/kdesrc/khtml: khtml_events.cpp Only in anfora/konq-embed/kdesrc/khtml: khtml_events.h Only in anfora/konq-embed/kdesrc/khtml: khtml_factory.cpp Only in anfora/konq-embed/kdesrc/khtml: khtml_factory.h Only in anfora/konq-embed/kdesrc/khtml: khtml_pagecache.cpp Only in anfora/konq-embed/kdesrc/khtml: khtml_pagecache.h Only in anfora/konq-embed/kdesrc/khtml: khtml_part.cpp Only in anfora/konq-embed/kdesrc/khtml: khtml_part.h Only in anfora/konq-embed/kdesrc/khtml: khtml_settings.cc Only in anfora/konq-embed/kdesrc/khtml: khtml_settings.h Only in anfora/konq-embed/kdesrc/khtml: khtmldefaults.h Only in anfora/konq-embed/kdesrc/khtml: khtmlimage.cpp Only in anfora/konq-embed/kdesrc/khtml: khtmlimage.h Only in anfora/konq-embed/kdesrc/khtml: khtmlview.cpp Only in anfora/konq-embed/kdesrc/khtml: khtmlview.h Only in anfora/konq-embed/kdesrc/khtml: misc Only in anfora/konq-embed/kdesrc/khtml: rendering Only in anfora/konq-embed/kdesrc/khtml: testcss.cpp Only in anfora/konq-embed/kdesrc/khtml: testkhtml.cpp Only in anfora/konq-embed/kdesrc/khtml: testkhtml.h Only in anfora/konq-embed/kdesrc/khtml: testrender.cpp Only in anfora/konq-embed/kdesrc/khtml: testrender.h Only in anfora/konq-embed/kdesrc/khtml: xml Only in anfora/konq-embed/kdesrc/kio: Makefile.in Only in anfora/konq-embed/kdesrc/kio: authinfo.cpp Only in anfora/konq-embed/kdesrc/kio: authinfo.h Only in anfora/konq-embed/kdesrc/kio: connection.cpp Only in anfora/konq-embed/kdesrc/kio: connection.h Only in anfora/konq-embed/kdesrc/kio: global.h Only in anfora/konq-embed/kdesrc/kio/http: Makefile.in Only in anfora/konq-embed/kdesrc/kio/http: http.cc Only in anfora/konq-embed/kdesrc/kio/http: http.h Only in anfora/konq-embed/kdesrc/kio/http: http_cache_cleaner.cpp Only in anfora/konq-embed/kdesrc/kio/http: https.cc Only in anfora/konq-embed/kdesrc/kio/http: https.h Only in anfora/konq-embed/kdesrc/kio/http/kcookiejar: Makefile.in Only in anfora/konq-embed/kdesrc/kio/http/kcookiejar: kcookiejar.cpp Only in anfora/konq-embed/kdesrc/kio/http/kcookiejar: kcookiejar.h Only in anfora/konq-embed/kdesrc/kio/http/kcookiejar: kcookieserver.cpp Only in anfora/konq-embed/kdesrc/kio/http/kcookiejar: kcookieserver.h Only in anfora/konq-embed/kdesrc/kio/http/kcookiejar: kcookiewin.cpp Only in anfora/konq-embed/kdesrc/kio/http/kcookiejar: kcookiewin.h Only in anfora/konq-embed/kdesrc/kio: http_slave_defaults.h Only in anfora/konq-embed/kdesrc/kio: ioslave_defaults.h Only in anfora/konq-embed/kdesrc/kio: slaveinterface.cpp Only in anfora/konq-embed/kdesrc/kio: slaveinterface.h Only in anfora/konq-embed/kdesrc/kjs: Makefile Only in anfora/konq-embed/kdesrc/kjs: Makefile.in Only in anfora/konq-embed/kdesrc/kjs: README Only in anfora/konq-embed/kdesrc/kjs: THANKS Only in anfora/konq-embed/kdesrc/kjs: array_object.cpp Only in anfora/konq-embed/kdesrc/kjs: array_object.h Only in anfora/konq-embed/kdesrc/kjs: bool_object.cpp Only in anfora/konq-embed/kdesrc/kjs: bool_object.h Only in anfora/konq-embed/kdesrc/kjs: collector.cpp Only in anfora/konq-embed/kdesrc/kjs: collector.h Only in anfora/konq-embed/kdesrc/kjs: configure.in.in Only in anfora/konq-embed/kdesrc/kjs: date_object.cpp Only in anfora/konq-embed/kdesrc/kjs: date_object.h Only in anfora/konq-embed/kdesrc/kjs: debugger.cpp Only in anfora/konq-embed/kdesrc/kjs: debugger.h Only in anfora/konq-embed/kdesrc/kjs: error_object.cpp Only in anfora/konq-embed/kdesrc/kjs: error_object.h Only in anfora/konq-embed/kdesrc/kjs: function.cpp Only in anfora/konq-embed/kdesrc/kjs: function.h Only in anfora/konq-embed/kdesrc/kjs: function_object.cpp Only in anfora/konq-embed/kdesrc/kjs: function_object.h Only in anfora/konq-embed/kdesrc/kjs: global_object.cpp Only in anfora/konq-embed/kdesrc/kjs: grammar.cpp Only in anfora/konq-embed/kdesrc/kjs: grammar.h Only in anfora/konq-embed/kdesrc/kjs: internal.cpp Only in anfora/konq-embed/kdesrc/kjs: internal.h Only in anfora/konq-embed/kdesrc/kjs: kjs.cpp Only in anfora/konq-embed/kdesrc/kjs: kjs.h Only in anfora/konq-embed/kdesrc/kjs: lexer.cpp Only in anfora/konq-embed/kdesrc/kjs: lexer.h Only in anfora/konq-embed/kdesrc/kjs: lexer.lut.h Only in anfora/konq-embed/kdesrc/kjs: lookup.cpp Only in anfora/konq-embed/kdesrc/kjs: lookup.h Only in anfora/konq-embed/kdesrc/kjs: math_object.cpp Only in anfora/konq-embed/kdesrc/kjs: math_object.h Only in anfora/konq-embed/kdesrc/kjs: math_object.lut.h Only in anfora/konq-embed/kdesrc/kjs: nodes.cpp Only in anfora/konq-embed/kdesrc/kjs: nodes.h Only in anfora/konq-embed/kdesrc/kjs: number_object.cpp Only in anfora/konq-embed/kdesrc/kjs: number_object.h Only in anfora/konq-embed/kdesrc/kjs: object.cpp Only in anfora/konq-embed/kdesrc/kjs: object.h Only in anfora/konq-embed/kdesrc/kjs: object_object.cpp Only in anfora/konq-embed/kdesrc/kjs: object_object.h Only in anfora/konq-embed/kdesrc/kjs: operations.cpp Only in anfora/konq-embed/kdesrc/kjs: operations.h Only in anfora/konq-embed/kdesrc/kjs: regexp.cpp Only in anfora/konq-embed/kdesrc/kjs: regexp.h Only in anfora/konq-embed/kdesrc/kjs: regexp_object.cpp Only in anfora/konq-embed/kdesrc/kjs: regexp_object.h Only in anfora/konq-embed/kdesrc/kjs: string_object.cpp Only in anfora/konq-embed/kdesrc/kjs: string_object.h Only in anfora/konq-embed/kdesrc/kjs: testkjs.cpp Only in anfora/konq-embed/kdesrc/kjs: types.cpp Only in anfora/konq-embed/kdesrc/kjs: types.h Only in anfora/konq-embed/kdesrc/kjs: ustring.cpp Only in anfora/konq-embed/kdesrc/kjs: ustring.h Only in anfora/konq-embed/kdesrc/kparts: Makefile.in Only in anfora/konq-embed/kdesrc/kparts: browserextension.cpp Only in anfora/konq-embed/kdesrc/kparts: browserextension.h Only in anfora/konq-embed/kdesrc/kparts: event.cpp Only in anfora/konq-embed/kdesrc/kparts: event.h Only in anfora/konq-embed/kdesrc/kparts: factory.cpp Only in anfora/konq-embed/kdesrc/kparts: factory.h Only in anfora/konq-embed/kdesrc/kparts: partmanager.cpp Only in anfora/konq-embed/kdesrc/kparts: partmanager.h Only in anfora/konq-embed/kdesrc/kssl: Makefile.in Only in anfora/konq-embed/kdesrc/kssl: README Only in anfora/konq-embed/kdesrc/kssl: TODO Only in anfora/konq-embed/kdesrc/kssl: configure.in.in Only in anfora/konq-embed/kdesrc/kssl: kssl Only in anfora/konq-embed/kdesrc/kssl: kssl.cc Only in anfora/konq-embed/kdesrc/kssl: kssl.h Only in anfora/konq-embed/kdesrc/kssl: ksslall.h Only in anfora/konq-embed/kdesrc/kssl: ksslcallback.c Only in anfora/konq-embed/kdesrc/kssl: ksslcertdlg.cc Only in anfora/konq-embed/kdesrc/kssl: ksslcertdlg.h Only in anfora/konq-embed/kdesrc/kssl: ksslcertificate.cc Only in anfora/konq-embed/kdesrc/kssl: ksslcertificate.h Only in anfora/konq-embed/kdesrc/kssl: ksslcertificatecache.cc Only in anfora/konq-embed/kdesrc/kssl: ksslcertificatecache.h Only in anfora/konq-embed/kdesrc/kssl: ksslcertificatefactory.cc Only in anfora/konq-embed/kdesrc/kssl: ksslcertificatefactory.h Only in anfora/konq-embed/kdesrc/kssl: ksslcertificatehome.cc Only in anfora/konq-embed/kdesrc/kssl: ksslcertificatehome.h Only in anfora/konq-embed/kdesrc/kssl: ksslconnectioninfo.cc Only in anfora/konq-embed/kdesrc/kssl: ksslconnectioninfo.h Only in anfora/konq-embed/kdesrc/kssl: kssldefs.h Only in anfora/konq-embed/kdesrc/kssl: ksslpeerinfo.cc Only in anfora/konq-embed/kdesrc/kssl: ksslpeerinfo.h Only in anfora/konq-embed/kdesrc/kssl: ksslpkcs12.cc Only in anfora/konq-embed/kdesrc/kssl: ksslpkcs12.h Only in anfora/konq-embed/kdesrc/kssl: ksslsettings.cc Only in anfora/konq-embed/kdesrc/kssl: ksslsettings.h Only in anfora/konq-embed/kdesrc/kssl: ksslutils.cc Only in anfora/konq-embed/kdesrc/kssl: ksslutils.h Only in anfora/konq-embed/kdesrc/kssl: ksslx509map.cc Only in anfora/konq-embed/kdesrc/kssl: ksslx509map.h Only in anfora/konq-embed/src: Makefile.in diff -wcbBr kdenox/konq-embed/src/mainwindow.cc anfora/konq-embed/src/mainwindow.cc *** kdenox/konq-embed/src/mainwindow.cc Sun Jun 3 17:44:47 2001 --- anfora/konq-embed/src/mainwindow.cc Fri Jun 8 14:42:23 2001 *************** *** 66,73 **** KURL *MainWindow::s_homeURL = 0; MainWindow::MainWindow() ! : QMainWindow( 0, 0, WType_TopLevel | WDestructiveClose ) { setCaption( "Konqueror" ); // not necessary, see below --- 66,80 ---- KURL *MainWindow::s_homeURL = 0; + // If the gui is the kiosk, no borders for the main window + #if defined(KONQ_GUI_KIOSK) + #define MAINWINDOW_FLAGS WType_TopLevel|WDestructiveClose|WStyle_Customize|WStyle_NoBorderEx + #else + #define MAINWINDOW_FLAGS WType_TopLevel|WDestructiveClose + #endif + MainWindow::MainWindow() ! : QMainWindow( 0, 0, MAINWINDOW_FLAGS ) { setCaption( "Konqueror" ); // not necessary, see below *************** *** 659,686 **** return 0; } - void MainWindow::popupMenu( const QString &_url, const QPoint & ) - { - if ( _url.isEmpty() || !m_views.current() ) - return; - - KURL url = m_views.current()->document()->completeURL( _url ); - - QPopupMenu *menu = new QPopupMenu( this ); - - menu->insertItem( "Open link in new window", 0 ); - menu->insertItem( "Bookmark this link", 1 ); - - int id = menu->exec( QCursor::pos() ); - - if ( id == 0 ) - createNewView( url ); - else if ( id == 1 ) - addBookmark( url ); - - delete menu; - } - void MainWindow::newView() { createNewView( KURL() ); --- 666,671 ---- *************** *** 806,811 **** --- 791,798 ---- #include "mainwindow_qpe.cc" #elif defined(KONQ_GUI_X11) #include "mainwindow_x11.cc" + #elif defined(KONQ_GUI_KIOSK) + #include "mainwindow_kiosk.cc" #else #error no GUI type specified #endif Only in anfora/konq-embed/src: mainwindow_kiosk.cc diff -wcbBr kdenox/konq-embed/src/mainwindow_qpe.cc anfora/konq-embed/src/mainwindow_qpe.cc *** kdenox/konq-embed/src/mainwindow_qpe.cc Sat Apr 21 15:29:31 2001 --- anfora/konq-embed/src/mainwindow_qpe.cc Fri Jun 8 14:14:41 2001 *************** *** 78,83 **** --- 78,105 ---- m_searchBar->hide(); } + void MainWindow::popupMenu( const QString &_url, const QPoint & ) + { + if ( _url.isEmpty() || !m_views.current() ) + return; + + KURL url = m_views.current()->document()->completeURL( _url ); + + QPopupMenu *menu = new QPopupMenu( this ); + + menu->insertItem( "Open link in new window", 0 ); + menu->insertItem( "Bookmark this link", 1 ); + + int id = menu->exec( QCursor::pos() ); + + if ( id == 0 ) + createNewView( url ); + else if ( id == 1 ) + addBookmark( url ); + + delete menu; + } + /* * vim:ts=4:et:sw=4 */ diff -wcbBr kdenox/konq-embed/src/mainwindow_x11.cc anfora/konq-embed/src/mainwindow_x11.cc *** kdenox/konq-embed/src/mainwindow_x11.cc Sat Apr 21 15:29:31 2001 --- anfora/konq-embed/src/mainwindow_x11.cc Fri Jun 8 14:14:29 2001 *************** *** 84,89 **** --- 84,112 ---- m_searchBar->hide(); } + + void MainWindow::popupMenu( const QString &_url, const QPoint & ) + { + if ( _url.isEmpty() || !m_views.current() ) + return; + + KURL url = m_views.current()->document()->completeURL( _url ); + + QPopupMenu *menu = new QPopupMenu( this ); + + menu->insertItem( "Open link in new window", 0 ); + menu->insertItem( "Bookmark this link", 1 ); + + int id = menu->exec( QCursor::pos() ); + + if ( id == 0 ) + createNewView( url ); + else if ( id == 1 ) + addBookmark( url ); + + delete menu; + } + /* * vim:ts=4:et:sw=4 */ Only in anfora: stamp-h.in Only in anfora: subdirs --------------070504070405040307060908 Content-Type: text/plain; name="mainwindow_kiosk.cc" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="mainwindow_kiosk.cc" #include "mainwindow.h" #include #include #include #include #include #include #include void MainWindow::initGUI() { QToolBar *tb = new QToolBar( this ); tb->setBackgroundColor( backgroundColor() ); // tb->setHorizontalStretchable( true ); m_bookmarksMenu = new QPopupMenu( this ); connect( m_bookmarksMenu, SIGNAL( aboutToShow() ), this, SLOT( bookmarksMenuAboutToShow() ) ); connect( m_bookmarksMenu, SIGNAL( activated( int ) ), this, SLOT( bookmarkActivated( int ) ) ); m_newView->addTo( m_mainMenu ); m_mainMenu->insertSeparator(); // m_encoding->addTo( m_mainMenu ); // // m_mainMenu->insertSeparator(); m_find->addTo( m_mainMenu ); m_mainMenu->insertSeparator(); m_preferences->addTo( m_mainMenu ); m_mainMenu->insertSeparator(); m_mainMenu->insertItem( i18n( "Bookmarks" ), m_bookmarksMenu ); m_mainMenu->insertSeparator(); m_close->addTo( m_mainMenu ); m_menu->addTo( tb ); m_back->addTo( tb ); m_forward->addTo( tb ); m_home->addTo( tb ); m_reload->addTo( tb ); m_stop->addTo( tb ); m_security->addTo( tb ); m_windows->addTo( tb ); tb->show(); statusBar()->setSizeGripEnabled( false ); m_searchBar = new QToolBar( "searchbar", this, QMainWindow::Top, true ); m_findInput = new QLineEdit( m_searchBar, "search" ); m_searchBar->setStretchableWidget( m_findInput ); m_closeFind->addTo( m_searchBar ); m_searchBar->hide(); } void MainWindow::popupMenu( const QString &_url, const QPoint & ) { // There're no popup menus for the kiosk } /* * vim:ts=4:et:sw=4 */ --------------070504070405040307060908-- _______________________________________________ Konq-e mailing list Konq-e@master.kde.org http://master.kde.org/mailman/listinfo/konq-e