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

List:       kde-commits
Subject:    kdenox/konq-embed
From:       Stefan Eilers <stefan.eilers () basyskom ! de>
Date:       2007-02-16 17:29:15
Message-ID: 1171646955.828290.21633.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 634241 by eilers:

Added new configure parameter "--enable-fullscreenmenu" to keep the menu
activated if fullscreen mode is enabled



 M  +7 -1      dropin/kio/krun.cpp  
 M  +6 -0      src/configure.in.in  
 M  +4 -0      src/mainwindow_road.cc  


--- trunk/kdenox/konq-embed/dropin/kio/krun.cpp #634240:634241
@@ -226,7 +226,13 @@
 	emit error();
     }
     else{
-        job->kill();
+        if (mtype == "text/html" || mtype=="text/xml" || 
+            mtype=="application/xhtml+xml" || mtype=="text/plain") {
+            kdDebug() << "Cache: Will not be downloaded.." << endl;
+        } else {
+            kdDebug() << "Cache: Will be downloaded.. Stop this job" << endl;
+          job->kill();
+        }
 	foundMimeType( mtype );
     }
 
--- trunk/kdenox/konq-embed/src/configure.in.in #634240:634241
@@ -70,6 +70,12 @@
     AC_DEFINE_UNQUOTED(ENABLE_FONTSUBS, 1, [Defined if font substitution is \
enabled])  fi
 
+AC_ARG_ENABLE(fullscreenmenu,[  --enable-fullscreenmenu       Enable menu while \
fullscreen mode is active], +              \
want_fullscreenmenu=$enableval,want_fullscreenmenu=no) +if test \
"x$want_fullscreenmenu" = "xyes"; then +    AC_DEFINE_UNQUOTED(ENABLE_FULLSCREENMENU, \
1, [Defined if menu is enabled while in fullscreen mode]) +fi
+
 AC_ARG_ENABLE(largeicons,[  --enable-largeicons     Use large icons in toolbar],
               want_largeicons=$enableval,want_largeicons=no)
 AM_CONDITIONAL(LARGEICONS, test "x$want_largeicons" = "xyes")
--- trunk/kdenox/konq-embed/src/mainwindow_road.cc #634240:634241
@@ -41,6 +41,8 @@
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 
+#include <config.h>
+
 #include <roadmode.h>
 #include <roadtabbar.h>
 #include <websearcher.h>
@@ -366,8 +368,10 @@
     if ( isFullScreen )
     {
 	emit fullscreen();
+#ifndef ENABLE_FULLSCREENMENU
         m_fullscreenOff->show();
         m_popupMainMenuAction->setEnabled(false);
+#endif
     }
     else
     {


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