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

List:       kde-commits
Subject:    extragear/base/konq-plugins/domtreeviewer
From:       Harri Porten <porten () kde ! org>
Date:       2008-12-24 9:51:08
Message-ID: 1230112268.463047.18294.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 900992 by porten:

Moved view/hide options into the kxmlgui window before
I add more. Getting crowded.


 M  +0 -11     domtreeview.cpp  
 M  +0 -42     domtreeviewbase.ui  
 M  +4 -0      domtreeviewerui.rc  
 M  +21 -0     domtreewindow.cpp  


--- trunk/extragear/base/konq-plugins/domtreeviewer/domtreeview.cpp #900991:900992
@@ -129,17 +129,6 @@
   const QFont font(KGlobalSettings::generalFont());
   m_listView->setFont( font );
 
-  m_pureCheckBox->setChecked(m_bPure);
-  connect(m_pureCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotPureToggled(bool)));
-
-  m_showAttributesCheckBox->setChecked(m_bShowAttributes);
-  connect(m_showAttributesCheckBox, SIGNAL(toggled(bool)), this,
-         SLOT(slotShowAttributesToggled(bool)));
-
-  m_highlightHTMLCheckBox->setChecked(m_bHighlightHTML);
-  connect(m_highlightHTMLCheckBox, SIGNAL(toggled(bool)), this,
-         SLOT(slotHighlightHTMLToggled(bool)));
-
   connect(m_listView, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this,
 	  SLOT(slotItemClicked(QTreeWidgetItem *)));
   m_listView->setContextMenuPolicy(Qt::CustomContextMenu);
--- trunk/extragear/base/konq-plugins/domtreeviewer/domtreeviewbase.ui #900991:900992
@@ -372,45 +372,6 @@
      </widget>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QGroupBox" name="groupBox2" >
-     <property name="title" >
-      <string>DOM Tree Options</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="QCheckBox" name="m_pureCheckBox" >
-        <property name="text" >
-         <string>&amp;Pure</string>
-        </property>
-        <property name="checked" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="m_showAttributesCheckBox" >
-        <property name="text" >
-         <string>Show &amp;attributes</string>
-        </property>
-        <property name="checked" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="m_highlightHTMLCheckBox" >
-        <property name="text" >
-         <string>Highlight &amp;HTML</string>
-        </property>
-        <property name="checked" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
@@ -440,9 +401,6 @@
   <tabstop>nodeValue</tabstop>
   <tabstop>contentEditor</tabstop>
   <tabstop>applyContent</tabstop>
-  <tabstop>m_pureCheckBox</tabstop>
-  <tabstop>m_showAttributesCheckBox</tabstop>
-  <tabstop>m_highlightHTMLCheckBox</tabstop>
   <tabstop>nodeAttributes</tabstop>
  </tabstops>
  <includes>
--- trunk/extragear/base/konq-plugins/domtreeviewer/domtreeviewerui.rc #900991:900992
@@ -10,6 +10,10 @@
   <Action name="tree_inc_level" />
   <Action name="tree_dec_level" />
   <Separator />
+  <Action name="show_dom_pure" />
+  <Action name="show_dom_attributes" />
+  <Action name="show_highlight_html" />
+  <Separator />
   <Action name="show_msg_dlg" />
  </Menu>
  <Menu name="go"><text>&amp;Go</text>
--- trunk/extragear/base/konq-plugins/domtreeviewer/domtreewindow.cpp #900991:900992
@@ -156,6 +156,27 @@
 
     KStandardAction::redisplay(m_view, SLOT(refresh()), actionCollection());
 
+    // Show/hide options
+    QAction *pure = actionCollection()->addAction("show_dom_pure");
+    pure->setText(i18n("Pure DOM Tree"));
+    pure->setCheckable(true);
+    pure->setChecked(true);
+    connect(pure, SIGNAL(toggled(bool)), m_view, SLOT(slotPureToggled(bool)));
+
+    QAction *attr = actionCollection()->addAction("show_dom_attributes");
+    attr->setText(i18n("Show DOM Attributes"));
+    attr->setCheckable(true);
+    attr->setChecked(true);
+    connect(attr, SIGNAL(toggled(bool)),
+            m_view, SLOT(slotShowAttributesToggled(bool)));
+
+    QAction *highlight = actionCollection()->addAction("show_highlight_html");
+    highlight->setText(i18n("Highlight HTML"));
+    highlight->setCheckable(true);
+    highlight->setChecked(true);
+    connect(highlight, SIGNAL(toggled(bool)),
+            m_view, SLOT(slotHighlightHTMLToggled(bool)));
+
     // toggle manipulation dialog
     QAction *a = actionCollection()->addAction("show_msg_dlg");
     a->setText(i18n("Show Message Log"));
[prev in list] [next in list] [prev in thread] [next in thread]