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

List:       kde-commits
Subject:    kdelibs/kdeui
From:       Sandro Giessl <ceebx () users ! sourceforge ! net>
Date:       2004-04-07 10:47:23
Message-ID: 20040407104723.C44809A1B () office ! kde ! org
[Download RAW message or body]

CVS commit by giessl: 

Keep track of visible ("line-") and invisible separators.


  M +19 -5     kedittoolbar.cpp   1.83


--- kdelibs/kdeui/kedittoolbar.cpp  #1.82:1.83
@@ -44,4 +44,7 @@
 #include <kdebug.h>
 
+#define LINESEPARATORSTRING i18n("--- line separator ---")
+#define SEPARATORSTRING i18n("--- separator ---")
+
 static void dump_xml(const QDomDocument& doc)
 {
@@ -649,4 +652,5 @@ void KEditToolbarWidget::loadActionList(
   static const QString &tagActionList= KGlobal::staticQString( "ActionList" );
   static const QString &attrName     = KGlobal::staticQString( "name" );
+  static const QString &attrLineSeparator = KGlobal::staticQString( "lineSeparator" );
 
   int     sep_num = 0;
@@ -671,5 +675,9 @@ void KEditToolbarWidget::loadActionList(
     {
       ToolbarItem *act = new ToolbarItem(m_activeList, tagSeparator, sep_name.arg(sep_num++), QString::null);
-      act->setText(1, "-----");
+      bool isLineSep = ( it.attribute(attrLineSeparator, "false").lower() == QString::fromLatin1("true") );
+      if(isLineSep)
+        act->setText(1, LINESEPARATORSTRING);
+      else
+        act->setText(1, SEPARATORSTRING);
       it.setAttribute( attrName, act->internalName() );
       continue;
@@ -736,7 +744,9 @@ void KEditToolbarWidget::loadActionList(
   }
 
-  // finally, add a default separator to the inactive list
+  // finally, add default separators to the inactive list
   ToolbarItem *act = new ToolbarItem(m_inactiveList, tagSeparator, sep_name.arg(sep_num++), QString::null);
-  act->setText(1, "-----");
+  act->setText(1, LINESEPARATORSTRING);
+  act = new ToolbarItem(m_inactiveList, tagSeparator, sep_name.arg(sep_num++), QString::null);
+  act->setText(1, SEPARATORSTRING);
 }
 
@@ -843,4 +853,5 @@ void KEditToolbarWidget::slotInsertButto
   static const QString &tagSeparator = KGlobal::staticQString( "Separator" );
   static const QString &attrName     = KGlobal::staticQString( "name" );
+  static const QString &attrLineSeparator = KGlobal::staticQString( "lineSeparator" );
 
   // we're modified, so let this change
@@ -851,7 +862,10 @@ void KEditToolbarWidget::slotInsertButto
   QDomElement new_item;
   // let's handle the separator specially
-  if (item->text(1) == "-----")
+  if (item->text(1) == LINESEPARATORSTRING) {
     new_item = domDocument().createElement(tagSeparator);
-  else
+    new_item.setAttribute(attrLineSeparator, "true");
+  } else if (item->text(1) == SEPARATORSTRING) {
+    new_item = domDocument().createElement(tagSeparator);
+  } else
     new_item = domDocument().createElement(tagAction);
   new_item.setAttribute(attrName, item->internalName());


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