Bug 89673 - if menubar is hidden, please add "show menubar" entry to context menu
Summary: if menubar is hidden, please add "show menubar" entry to context menu
Status: RESOLVED FIXED
Alias: None
Product: kpdf
Classification: Applications
Component: general (show other bugs)
Version: unspecified
Platform: unspecified Linux
: NOR wishlist
Target Milestone: ---
Assignee: Albert Astals Cid
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-09-17 08:24 UTC by Wilbert Berendsen
Modified: 2004-09-18 13:55 UTC (History)
0 users

See Also:
Latest Commit:
Version Fixed In:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Wilbert Berendsen 2004-09-17 08:24:15 UTC
Version:           v0.3 (using KDE 3.3.0, compiled sources)
Compiler:          gcc version 3.3.4 20040623 (Gentoo Linux 3.3.4-r1, ssp-3.3.2-2, pie-8.7.6)
OS:                Linux (i686) release 2.6.7-gentoo-r14

I knew to press Ctrl+M, but otherwise I would not have my menubar gotten back :-)
Comment 1 Albert Astals Cid 2004-09-18 13:55:30 UTC
CVS commit by aacid: 

 - kpdf_pagewidget sends upstream the right button clicked signal even if there is no document open
 - Plug the show menu bar option in RMB popup when menubar is hidden and unplug it when menubar is there
CCMAIL:89673-done@bugs.kde.org


  M +4 -4      kpdf_pagewidget.cc   1.40
  M +8 -2      kpdf_shell.cpp   1.34


--- kdegraphics/kpdf/kpdf/kpdf_pagewidget.cc  #1.39:1.40
@@ -68,4 +68,8 @@ namespace KPDF
     {
         double x, y;
+
+        if ( e->button() & RightButton )
+            emit rightClick();
+
         if (m_doc == 0)
             return;
@@ -75,8 +79,4 @@ namespace KPDF
             setCursor( sizeAllCursor );
         }
-        else if ( e->button() & RightButton )
-        {
-            emit rightClick();
-        }
 
         m_outputdev->cvtDevToUser(e->x(), e->y(), &x, &y);

--- kdegraphics/kpdf/kpdf/kpdf_shell.cpp  #1.33:1.34
@@ -129,5 +129,4 @@ Shell::setupActions()
   m_fullScreenAction = KStdAction::fullScreen( this, SLOT( slotUpdateFullScreen() ), actionCollection(), this );
   m_popup = new KPopupMenu( this, "rmb popup" );
-  m_popup->insertTitle( i18n( "Full Screen Options" ) );
   m_fullScreenAction->plug( m_popup );
 }
@@ -145,7 +144,13 @@ void Shell::slotShowMenubar()
 {
     if ( m_showMenuBarAction->isChecked() )
+    {
         menuBar()->show();
+        m_showMenuBarAction->unplug( m_popup );
+    }
     else
+    {
         menuBar()->hide();
+        m_showMenuBarAction->plug( m_popup );
+    }
 }
 
@@ -197,4 +202,5 @@ void Shell::slotUpdateFullScreen()
     if( m_fullScreenAction->isChecked())
     {
+        m_showMenuBarAction->unplug( m_popup );
         menuBar()->hide();
         toolBar()->hide();
@@ -212,5 +218,5 @@ void Shell::slotUpdateFullScreen()
         //kapp->removeEventFilter( m_fsFilter );
         //m_pdfpart->setFullScreen( false );
-        menuBar()->show();
+        slotShowMenubar();
         toolBar()->show();
         showNormal();