Changeset 30

Timestamp:

05/26/08 04:57:31 (4 years ago)

Author:

antonbatenev.ya.ru

Message:

• добавление метода пометки сообщений как непрочитаных в хранилище;
• начало работы над контекстным меню деревьев;

Location:

trunk

Files:

• avalon.sql (modified) (2 diffs)
• forum_tree.cpp (modified) (3 diffs)
• forum_tree.h (modified) (2 diffs)
• iforum_tree.h (modified) (1 diff)
• message_tree.cpp (modified) (3 diffs)
• message_tree.h (modified) (1 diff)
• storage/istorage.h (modified) (1 diff)
• storage/mysql_storage.cpp (modified) (1 diff)
• storage/mysql_storage.h (modified) (1 diff)

trunk/avalon.sql

@@ -86 +86 @@
   `has_child` tinyint(1) NOT NULL COMMENT 'флаг наличия дочерних сообщений',
   PRIMARY KEY  (`id`),
-  KEY `ix_parent` (`id_parent`)
+  KEY `ix_parent` (`id_parent`),
+  KEY `ix_topic` (`id_topic`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='сообщения';
 SET character_set_client = @saved_cs_client;
@@ -204 +205 @@
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2008-05-25  0:38:57
+-- Dump completed on 2008-05-25 23:11:51

trunk/forum_tree.cpp

@@ -29 +29 @@
         setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
+        setContextMenuPolicy(Qt::CustomContextMenu);
+
         setColumnCount(2);
 
@@ -38 +40 @@
 
         connect(this, SIGNAL(itemSelectionChanged()), this, SLOT(selection_changed()));
+        connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(context_menu_request(const QPoint&)));
 
         Reload();
@@ -226 +229 @@
 //----------------------------------------------------------------------------------------------
 
+QTreeWidgetItem* AForumTree::GetSelectedForumItem ()
+{
+        QList<QTreeWidgetItem*> list_selected = selectedItems();
+
+        if (list_selected.count() == 0)
+                return NULL;
+
+        QTreeWidgetItem* item_selected = list_selected[0];
+
+        bool is_group = item_selected->childCount();
+
+        if (is_group == true)
+                return NULL;
+
+        return item_selected;
+}
+//----------------------------------------------------------------------------------------------
+
 void AForumTree::selection_changed ()
 {
-        QList<QTreeWidgetItem*> list_selected = selectedItems();
-
-        if (list_selected.count() == 0)
-        {
+        ForumTreeWidgetItem* forum_item = static_cast<ForumTreeWidgetItem*>(GetSelectedForumItem());
+
+        if (forum_item != NULL)
+                m_message_tree->ChangeForum(forum_item->PTag());
+        else
                 m_message_tree->ChangeForum(NULL);
-                return;
-        }
-
-        QTreeWidgetItem* item_selected = list_selected[0];
-
-        bool is_group = item_selected->childCount();
-
-        if (is_group == true)
-        {
-                m_message_tree->ChangeForum(NULL);
-                return;
-        }
-
-        ForumTreeWidgetItem* forum_item = static_cast<ForumTreeWidgetItem*>(item_selected);
-
-        m_message_tree->ChangeForum(forum_item->PTag());
-}
-//----------------------------------------------------------------------------------------------
+}
+//----------------------------------------------------------------------------------------------
+
+void AForumTree::ChangeUnreadCount (int count)
+{
+        ForumTreeWidgetItem* forum_item = static_cast<ForumTreeWidgetItem*>(GetSelectedForumItem());
+
+        if (forum_item == NULL)
+                return;
+
+        QString text = forum_item->text(1);
+
+        int old_count = 0;
+
+        if (text != "-")
+                old_count = text.toInt();
+
+        old_count += count;
+
+        if (old_count != 0)
+        {
+                forum_item->setText(1, QString::number(old_count));
+
+                QFont font = forum_item->font(1);
+                font.setBold(true);
+                forum_item->setFont(1, font);
+        }
+        else
+        {
+                forum_item->setText(1, "-");
+
+                QFont font = forum_item->font(1);
+                font.setBold(false);
+                forum_item->setFont(1, font);
+        }
+}
+//----------------------------------------------------------------------------------------------
+
+void AForumTree::context_menu_request (const QPoint& pos)
+{
+QMessageBox::critical(m_parent, QString::fromUtf8("Ошибка!"), QString::fromUtf8("Не выбрано хранилище данных"));
+        (new QMenu("abcd"))->exec(pos);
+}
+//----------------------------------------------------------------------------------------------

trunk/forum_tree.h

@@ -38 +38 @@
                 IMessageView* m_message_view;
 
+                // возвращает текущий выделенный элемент форума или NULL, если группа
+                QTreeWidgetItem* GetSelectedForumItem ();
+
         // IForumTree
         public:
@@ -47 +50 @@
                 void ReloadUnread ();
 
+                // изменение количества непрочитанных сообщений
+                void ChangeUnreadCount (int count);
+
         private slots:
 
                 void selection_changed ();
+
+                void context_menu_request (const QPoint& pos);
 };
 //----------------------------------------------------------------------------------------------

trunk/iforum_tree.h

@@ -20 +20 @@
                 // перезагрузка количества непрочитаных
                 virtual void ReloadUnread () = 0;
+
+                // изменение количества непрочитанных сообщений
+                virtual void ChangeUnreadCount (int count) = 0;
 };
 //----------------------------------------------------------------------------------------------

trunk/message_tree.cpp

@@ -307 +307 @@
 //----------------------------------------------------------------------------------------------
 
+QTreeWidgetItem* AMessageTree::GetSelectedItem ()
+{
+        QList<QTreeWidgetItem*> list_selected = selectedItems();
+
+        if (list_selected.size() == 0)
+                return NULL;
+
+        return list_selected.at(0);
+}
+//----------------------------------------------------------------------------------------------
+
 void AMessageTree::timer_on_timer ()
 {
-        m_timer.stop();
+        MessageTreeWidgetItem* item = static_cast<MessageTreeWidgetItem*>(GetSelectedItem());
+
+        if (item != NULL)
+                MakeItemAsRead(item);
 }
 //----------------------------------------------------------------------------------------------
@@ -315 +329 @@
 void AMessageTree::selection_changed ()
 {
-        QList<QTreeWidgetItem*> list_selected = selectedItems();
-
-        if (list_selected.size() == 0)
-                return;
-
-        MessageTreeWidgetItem* item = static_cast<MessageTreeWidgetItem*>(list_selected.at(0));
+        MessageTreeWidgetItem* item = static_cast<MessageTreeWidgetItem*>(GetSelectedItem());
+
+        if (item == NULL)
+                return;
 
         if (item->PTag()->IsMessageLoaded == false)
@@ -358 +370 @@
 }
 //----------------------------------------------------------------------------------------------
+
+void AMessageTree::MakeItemAsRead (QTreeWidgetItem* widget_item)
+{
+        MessageTreeWidgetItem* item = static_cast<MessageTreeWidgetItem*>(widget_item);
+
+        AMessageInfoEx* info = item->PTag();
+
+        // пометить как прочитаное в хранилище
+        std::auto_ptr<IStorage> storage(AStorageFactory::GetStorage());
+
+        if (storage.get() == NULL)
+        {
+                QMessageBox::critical(m_parent, QString::fromUtf8("Ошибка!"), QString::fromUtf8("Не выбрано хранилище данных"));
+                return;
+        }
+
+        if (storage->SetMessageAsRead(info->ID, true, NULL) == false)
+        {
+                storage->ShowError(m_parent);
+                return;
+        }
+
+        // пометка как прочитанного в дереве сообщений
+        if (info->IsRead == true)
+                return;
+
+        info->IsRead = true;
+
+        if (info->UnreadChildCount != 0)
+                item->setIcon(0, m_child_unread);
+        else
+                item->setIcon(0, m_message_read);
+
+        MessageTreeWidgetItem* parent_item = static_cast<MessageTreeWidgetItem*>(item->parent());
+
+        while (parent_item != NULL)
+        {
+                AMessageInfoEx* parent_info = parent_item->PTag();
+
+                parent_info->UnreadChildCount--;
+
+                if (parent_info->IsRead == true && parent_info->UnreadChildCount == 0)
+                        parent_item->setIcon(0, m_message_read);
+
+                parent_item = static_cast<MessageTreeWidgetItem*>(parent_item->parent());
+        }
+
+        // уменьшение количества непрочитанных в дереве форума
+        m_forum_tree->ChangeUnreadCount(-1);
+}
+//----------------------------------------------------------------------------------------------

trunk/message_tree.h

@@ -43 +43 @@
                 QTimer m_timer;
 
+                // возвращает текущий выделенный элемент
+                QTreeWidgetItem* GetSelectedItem ();
+
+                // разворачивает ветку до непрочитанных сообщений
                 void ExpandUnreadChild (QTreeWidgetItem* item);
+
+                // построение ветки
                 void BuildTree (QTreeWidgetItem* parent, AMessageInfoExList* list);
+
+                // пометка сообщения как прочитанного
+                void MakeItemAsRead (QTreeWidgetItem* item);
 
         // IMessageTree

trunk/storage/istorage.h

@@ -57 +57 @@
                 // возвращает тело сообщения
                 virtual bool GetMessageInfo (int id_message, QString& body, IProgress* progress = NULL) = 0;
+
+                // пометить сообщение как прочитанное/непрочитанное
+                virtual bool SetMessageAsRead (int id_message, bool read, IProgress* progress = NULL) = 0;
 };
 //----------------------------------------------------------------------------------------------

trunk/storage/mysql_storage.cpp

@@ -1712 +1712 @@
 }
 //----------------------------------------------------------------------------------------------
+
+bool AMySQLStorage::SetMessageAsRead (int id_message, bool read, IProgress* progress)
+{
+        if (progress != NULL)
+                progress->OnProgress(0);
+
+        QString sql;
+
+        //
+        // получение тела сообщения
+        //
+
+        if (read == true)
+        {
+                sql += "DELETE FROM\n";
+                sql += "        `unread`\n";
+                sql += "WHERE\n";
+                sql += "        `id_message` = " + QString::number(id_message);
+        }
+        else
+        {
+                sql += "REPLACE INTO `unread`\n";
+                sql += "(\n";
+                sql += "        `id_message`,\n";
+                sql += "        `id_forum`,\n";
+                sql += "        `id_topic`,\n";
+                sql += "        `message_date`\n";
+                sql += ")\n";
+                sql += "SELECT\n";
+                sql += "        `id`,\n";
+                sql += "        `id_forum`,\n";
+                sql += "        `id_topic`,\n";
+                sql += "        `message_date`\n";
+                sql += "FROM\n";
+                sql += "        `message`\n";
+                sql += "WHERE\n";
+                sql += "        `id_message` = " + QString::number(id_message);
+        }
+
+        std::auto_ptr<AQuery> query(CreateQuery(sql, false));
+
+        if (query.get() == NULL)
+                return ReturnError(AMySQLDatabase::LastError());
+
+        if (query->exec() == false)
+                return ReturnError(query->LastError());
+
+        return ReturnSuccess();
+}
+//----------------------------------------------------------------------------------------------

trunk/storage/mysql_storage.h

@@ -68 +68 @@
                 // возвращает тело сообщения
                 bool GetMessageInfo (int id_message, QString& body, IProgress* progress = NULL);
+
+                // пометить сообщение как прочитанное/непрочитанное
+                bool SetMessageAsRead (int id_message, bool read, IProgress* progress = NULL);
 };
 //----------------------------------------------------------------------------------------------