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

List:       kde-commits
Subject:    KDE/kdeedu/kvoctrain/kvoctrain
From:       Peter Hedlund <peter () peterandlinda ! com>
Date:       2007-01-13 4:55:05
Message-ID: 1168664105.179039.3026.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 622807 by hedlund:

Work on appending languages

 M  +0 -15     kva_header.cpp  
 M  +2 -3      kva_init.cpp  
 M  +36 -30    kvoctrain.cpp  


--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kva_header.cpp #622806:622807
@@ -269,21 +269,6 @@
     }
     break;
 
-    case IDH_APPEND: {
-
-      QString msg;
-      if (header1 == 0xFF) {
-        msg = i18n("Appends a new language");
-        slotStatusHelpMsg(msg);
-      }
-      else if (header1 < (int) m_languages.size() ) {
-        QString from = m_languages.longId(header1);
-        msg = i18n("Appends %1 as new language", from);
-        slotStatusHelpMsg(msg);
-      }
-    }
-    break;
-
     case IDH_REMOVE: {
       QString from = header1 ? m_doc->identifier(header1) : \
m_doc->originalIdentifier();  if (!m_languages.findLongId(from).isEmpty())
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kva_init.cpp #622806:622807
@@ -237,9 +237,8 @@
   vocabAppendLanguage = \
actionCollection()->add<KSelectAction>("vocab_append_language");  \
vocabAppendLanguage->setIcon(KIcon("insert_table_col"));  \
                vocabAppendLanguage->setText(i18n("&Append Language"));
-  connect(vocabAppendLanguage->menu(), SIGNAL(aboutToShow()), this, \
                SLOT(aboutToShowVocabAppendLanguage()));
-  connect (vocabAppendLanguage->menu(), SIGNAL(activated(int)), this, \
                SLOT(slotAppendLang(int)));
-  connect (vocabAppendLanguage->menu(), SIGNAL(highlighted(int)), this, \
SLOT(slotHeaderStatus(int))); +  connect(vocabAppendLanguage->menu(), \
SIGNAL(aboutToShow()),    this, SLOT(aboutToShowVocabAppendLanguage())); +  \
connect(vocabAppendLanguage,         SIGNAL(triggered(int)),   this, \
SLOT(slotAppendLang(int)));  
   vocabSetLanguage = actionCollection()->add<KSelectAction>("vocab_set_language");
   vocabSetLanguage->setIcon(KIcon("set_language"));
--- trunk/KDE/kdeedu/kvoctrain/kvoctrain/kvoctrain.cpp #622806:622807
@@ -751,36 +751,29 @@
 }
 
 
-void KVocTrainApp::slotAppendLang(int header_and_cmd)
+void KVocTrainApp::slotAppendLang(int index)
 {
-   int lang_id = (header_and_cmd >> 16) & 0xFF;
+  if (index >= m_languages.size()){
 
-   if (lang_id == 0xFF) {
-     QString msg = i18n("To append a new language which is not listed in "
-                        "the submenu, you must first add its data in the "
-                        "general options dialog.\n"
-                        "Should this dialog be invoked now?");
-    if( KMessageBox::Yes == KMessageBox::questionYesNo(this,
-                  msg,
-                  "",KGuiItem(i18n("Invoke Dialog")), KGuiItem(i18n("Do Not \
                Invoke"))))
-     {
-       slotGeneralOptionsPage(1);
-     }
-     return;
-   }
+    QString msg = i18n("To add a language which is not listed in the menu, you must \
first define its properties in the " +                       "general options \
dialog.\n\nWould you like to add a new language?"); +    if (KMessageBox::Yes == \
KMessageBox::questionYesNo(this, msg)) +    {
+      slotGeneralOptionsPage(1);
+    }
+    return;
+  }
 
-   if (lang_id >= (int) m_languages.size())
-     return;
-   m_doc->appendIdentifier("");
-   int num = m_doc->numEntries()-1;
-   for (int i = 0; i < (int) num; i++) {
-      KEduVocExpression *expr = m_doc->entry(i);
-      expr->setType (num, expr->type(0));
-   }
+  m_doc->appendIdentifier("");
+  int num = m_doc->numEntries() - 1;
+  for (int i = 0; i < (int) num; i++) {
+    KEduVocExpression *expr = m_doc->entry(i);
+    expr->setType (num, expr->type(0));
+  }
 
-   m_doc->setIdentifier(m_doc->numIdentifiers()-1, m_languages.shortId(lang_id));
-   m_tableModel->reset();
-   m_doc->setModified();
+  m_doc->setIdentifier(m_doc->numIdentifiers() - 1, m_languages.shortId(index));
+  m_tableModel->reset();
+  m_doc->setModified();
 }
 
 
@@ -964,7 +957,6 @@
   if (m_doc != 0)
   {
     vocabAppendLanguage->clear();
-    QMenu * add_m = vocabAppendLanguage->menu();
 
     QStringList names;
     for (int i = 0; i < (int) m_languages.size(); i++)
@@ -975,15 +967,29 @@
         names.append(m_languages.longId(i));
     }
 
+    QAction* action = 0;
+
     for (int i = 0; i < (int) m_languages.size(); i++)
     {
       if(!m_languages.pixmapFile(i).isEmpty() && !m_languages.longId(i).isEmpty())
-        add_m->insertItem(QPixmap(m_languages.pixmapFile(i)), names[i], (i << 16) | \
IDH_APPEND); +        action = new QAction(QIcon(QPixmap(m_languages.pixmapFile(i))), \
names[i], vocabAppendLanguage->selectableActionGroup());  else
-        add_m->insertItem(names[i], (i << 16) | IDH_APPEND);
+        action = new QAction(names[i], \
vocabAppendLanguage->selectableActionGroup()); +      action->setWhatsThis(i18n("Add \
the language '%1' to the vocabulary", names[i])); +      \
action->setToolTip(action->whatsThis()); +      \
action->setStatusTip(action->whatsThis()); +      \
vocabAppendLanguage->addAction(action);  }
 
-    add_m->insertItem(i18n("Another Language..."), (0xFF << 16) | IDH_APPEND);
+    action = new QAction("", vocabAppendLanguage->selectableActionGroup());
+    action->setSeparator(true);
+    vocabAppendLanguage->addAction(action);
+
+    action = new QAction(i18n("&New Language..."), \
vocabAppendLanguage->selectableActionGroup()); +    action->setWhatsThis(i18n("Add a \
new language to the vocabulary")); +    action->setToolTip(action->whatsThis());
+    action->setStatusTip(action->whatsThis());
+    vocabAppendLanguage->addAction(action); 
   }
 }
 


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