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

List:       konq-e
Subject:    Kiosk improving patch
From:       Arnaud Rolly <arolly () anfora ! fr>
Date:       2001-06-22 15:22:34
[Download RAW message or body]

Here's a patch to have a better kiosk support. Basicaly, now, there are 
no toolbars on the screen, just the HTML rendering engine in full 
screen. (so it's a true kiosk look!)

I'd like to remove the images usage in mainwindow.cc. I think that here, 
i'll have to do #ifdef....#endif for the initialization of the actions. 
Does anyone has a better (cleaner) idea ?

Bye,

Arnaud Rolly

["kiosk.patch" (text/plain)]

diff -pu kdenox/konq-embed/src/mainwindow.cc anfora/konq-embed/src/mainwindow.cc
--- kdenox/konq-embed/src/mainwindow.cc	Mon Jun 11 18:18:14 2001
+++ anfora/konq-embed/src/mainwindow.cc	Fri Jun 22 16:47:53 2001
@@ -323,7 +323,9 @@ void MainWindow::find()
 {
     assert( m_views.current() );
 
+#ifndef KONQ_GUI_KIOSK
     m_searchBar->show();
+#endif // KONQ_GUI_KIOSK
 
     m_views.current()->setFindEnabled( true );
     m_views.current()->find();
@@ -333,7 +335,10 @@ void MainWindow::closeFind()
 {
     assert( m_views.current() );
 
+#ifndef KONQ_GUI_KIOSK
     m_searchBar->hide();
+#endif // KONQ_GUI_KIOSK
+
     m_views.current()->setFindEnabled( false );
 }
 
@@ -461,11 +466,13 @@ void MainWindow::disconnectView( View *v
         disconnect( view, SIGNAL( locationBarURLChanged( const QString & ) ),
                     this, SLOT( setLocationBarURL( const QString & ) ) );
 
+#ifndef KONQ_GUI_KIOSK
     disconnect( m_findInput, SIGNAL( textChanged( const QString & ) ),
                 view, SLOT( setFindText( const QString & ) ) );
 
     disconnect( m_findInput, SIGNAL( returnPressed() ),
                 view, SLOT( findNext() ) );
+#endif // KONQ_GUI_KIOSK
 
     disconnect( m_security, SIGNAL( activated() ),
                 view->document(), SLOT( slotSecurity() ) ); // ###
@@ -510,6 +517,9 @@ void MainWindow::connectView( View *view
         setLocationBarURL( view->locationBarURL() );
     }
 
+
+#ifndef KONQ_GUI_KIOSK
+
     connect( m_findInput, SIGNAL( textChanged( const QString & ) ),
              view, SLOT( setFindText( const QString & ) ) );
 
@@ -520,6 +530,7 @@ void MainWindow::connectView( View *view
         m_searchBar->show();
     else
         m_searchBar->hide();
+#endif // KONQ_GUI_KIOSK
 
     connect( m_security, SIGNAL( activated() ),
              view->document(), SLOT( slotSecurity() ) ); // ###
diff -pu kdenox/konq-embed/src/mainwindow.h anfora/konq-embed/src/mainwindow.h
--- kdenox/konq-embed/src/mainwindow.h	Sun Apr 22 19:14:11 2001
+++ anfora/konq-embed/src/mainwindow.h	Fri Jun 22 16:48:31 2001
@@ -127,8 +127,10 @@ private:
     QAction *m_newView;
     QAction *m_preferences;
 
+#ifndef KONQ_GUI_KIOSK
     QToolBar *m_searchBar;
     QLineEdit *m_findInput;
+#endif // KONQ_GUI_KIOSK
 
     QAction *m_addBookmark;
 
Only in anfora/konq-embed/src: mainwindow.moc
Only in anfora/konq-embed/src: mainwindow.o
diff -pu kdenox/konq-embed/src/mainwindow_kiosk.cc anfora/konq-embed/src/mainwindow_kiosk.cc
--- kdenox/konq-embed/src/mainwindow_kiosk.cc	Sat Jun  9 16:13:52 2001
+++ anfora/konq-embed/src/mainwindow_kiosk.cc	Fri Jun 22 16:52:24 2001
@@ -1,80 +1,8 @@
-
 #include "mainwindow.h"
 
-#include <qpopupmenu.h>
-#include <qtoolbar.h>
-#include <qaction.h>
-#include <qmenubar.h>
-#include <qlineedit.h>
-#include <qstatusbar.h>
-
-#include <klocale.h>
-
 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();
-    
+	// Minimum GUI for the kiosk, nothing more to initialise!
 }
 
 void MainWindow::popupMenu( const QString &_url, const QPoint & )

_______________________________________________
Konq-e mailing list
Konq-e@master.kde.org
http://master.kde.org/mailman/listinfo/konq-e


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