Merge branch 'master' of git@gitorious.org:~avaddon/rekonq/avaddon-clone.git

* 'master' of git@gitorious.org:~avaddon/rekonq/avaddon-clone.git:
  Fixing popup pos && removing unwanted statusBar
  0.1.6 version with new notifying system
  New notifying system. Perhaps this should be default for
  Deleting popup in empty msg
  Comments and Fixes
  New notify system
  Working on new notify system...
  start moving things..
  slot Save File As
  Finally fixed F5 shortcut
  New history menu code comments
  history menu fix

1 files changed, 21 insertions, 15 deletions

diff --git a/src/modelmenu.cpp b/src/modelmenu.cpp
index 8f174797..41c197f3 100644
--- a/src/modelmenu.cpp
+++ b/src/modelmenu.cpp
@@ -145,19 +145,25 @@ void ModelMenu::aboutToShow()
     postPopulated();
 }
 
+
+// WARNING 
+// the code commented out here is to create a second separator in the history menu
+// with ALL history, subdivided by days. 
 void ModelMenu::createMenu(const QModelIndex &parent, int max, QMenu *parentMenu, QMenu *menu)
 {
+    Q_UNUSED(parentMenu)
+
     if (!menu)
     {
-        QString title = parent.data().toString();
-        menu = new QMenu(title, this);
-        QIcon icon = qvariant_cast<QIcon>(parent.data(Qt::DecorationRole));
-        menu->setIcon(icon);
-        parentMenu->addMenu(menu);
-        QVariant v;
-        v.setValue(parent);
-        menu->menuAction()->setData(v);
-        connect(menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShow()));
+//         QString title = parent.data().toString();
+//         menu = new QMenu(title, this);
+//         QIcon icon = qvariant_cast<QIcon>(parent.data(Qt::DecorationRole));
+//         menu->setIcon(icon);
+//         parentMenu->addMenu(menu);
+//         QVariant v;
+//         v.setValue(parent);
+//         menu->menuAction()->setData(v);
+//         connect(menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShow()));
         return;
     }
 
@@ -171,12 +177,12 @@ void ModelMenu::createMenu(const QModelIndex &parent, int max, QMenu *parentMenu
     for (int i = 0; i < end; ++i)
     {
         QModelIndex idx = m_model->index(i, 0, parent);
-/*        if (m_model->hasChildren(idx))
-        {
-            createMenu(idx, -1, menu);
-        }
-        else
-        {*/
+//         if (m_model->hasChildren(idx))
+//         {
+//             createMenu(idx, -1, menu);
+//         }
+//         else
+//         {
             if (m_separatorRole != 0
                     && idx.data(m_separatorRole).toBool())
                 addSeparator();