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

List:       kde-commits
Subject:    kdevelop/parts/qeditor
From:       John Birch <jbb () kdevelop ! org>
Date:       2003-05-20 23:05:43
[Download RAW message or body]

CVS commit by jb: 

Make RMB menu in iconborder the same as kate menu


  M +15 -20    markerwidget.cpp   1.19


--- kdevelop/parts/qeditor/markerwidget.cpp  #1.18:1.19
@@ -131,6 +131,7 @@ void MarkerWidget::contextMenuEvent( QCo
 {
     QPopupMenu m( 0, "editor_breakpointsmenu" );
+    QPopupMenu sub( 0, "editor_breakpointsmenu_sub" );
 
-    int toggleBreakPoint = 0;
+    int toggleBreakpoint = 0;
     int toggleBookmark = 0;
     int lmbClickChangesBPs = 0;
@@ -142,24 +143,18 @@ void MarkerWidget::contextMenuEvent( QCo
         if ( e->y() >= p->rect().y() - yOffset && e->y() <= p->rect().y() + \
p->rect().height() - yOffset ) {  ParagData* data = (ParagData*) p->extraData();
-            if ( data->mark() & 0x02 )
-                toggleBreakPoint = m.insertItem( i18n( "Clear %1" \
                ).arg(m_breakpointDescr) );
-            else
-                toggleBreakPoint = m.insertItem( i18n( "Set %1" \
                ).arg(m_breakpointDescr) );
-            m.setItemEnabled(toggleBreakPoint, m_changeBreakpointsAllowed);
-            m.insertSeparator();
 
-            if ( data->mark() & 0x01 )
-                toggleBookmark = m.insertItem( i18n( "Clear %1" \
                ).arg(m_bookmarkDescr) );
-            else
-                toggleBookmark = m.insertItem( i18n( "Set %1" ).arg(m_bookmarkDescr) \
); +            toggleBookmark = m.insertItem( m_bookmarkDescr );
             m.setItemEnabled(toggleBookmark, m_changeBookmarksAllowed);
-            m.insertSeparator();
+            m.setItemChecked(toggleBookmark, data->mark() & 0x01);
 
-            lmbClickChangesBPs = m.insertItem( i18n( "Left Mouse Button Click Sets: \
                %1" ).arg(m_breakpointDescr) );
-            lmbClickChangesBookmarks = m.insertItem( i18n( "Left Mouse Button Click \
Sets: %1" ).arg(m_bookmarkDescr) ); +            toggleBreakpoint = m.insertItem( \
m_breakpointDescr ); +            m.setItemEnabled(toggleBreakpoint, \
m_changeBreakpointsAllowed); +            m.setItemChecked(toggleBreakpoint, \
data->mark() & 0x02); +            
+            m.insertItem("Set default mark type", &sub);
+            lmbClickChangesBookmarks = sub.insertItem( m_bookmarkDescr );
+            lmbClickChangesBPs = sub.insertItem( m_breakpointDescr );
             m.setItemChecked(lmbClickChangesBPs, m_clickChangesBPs);
             m.setItemChecked(lmbClickChangesBookmarks, !m_clickChangesBPs);
-
-            //m.insertSeparator();
             break;
         }
@@ -186,5 +181,5 @@ void MarkerWidget::contextMenuEvent( QCo
             emit markChanged(mark, KTextEditor::MarkInterfaceExtension::MarkAdded);
         }
-    } else if ( res == toggleBreakPoint && m_changeBreakpointsAllowed ) {
+    } else if ( res == toggleBreakpoint && m_changeBreakpointsAllowed ) {
         mark.type = 0x02;
         if ( data->mark() & 0x02 ) {


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