Changeset 2979

Timestamp:

04/28/06 06:41:16 (3 years ago)

Author:

madcat

Message:

Servers removing support from gui. Context menu in gui server list.

Files:

• hydranode/hncore/cgcomm/sub_modules.cpp (modified) (2 diffs)
• hydranode/hncore/ed2k/serverlist.cpp (modified) (4 diffs)
• hydranode/hngui/plugins/donkeypage.cpp (modified) (5 diffs)
• hydranode/hngui/plugins/donkeypage.h (modified) (1 diff)
• hydranode/hngui/plugins/donkeypage_ui.ui (modified) (1 diff)

hydranode/hncore/cgcomm/sub_modules.cpp

@@ -246 +246 @@
-                sendPacket(tmp.str());
-                m_dirty.erase(obj);
-                logDebug("Object ADDED: " + obj->getParent()->getName() + " + " + obj->getName());
-        } else if (evt == OBJ_REMOVED && obj->getParent()) {
-                std::ostringstream tmp;
@@ -254 +253 @@
-                sendPacket(tmp.str());
-                m_dirty.erase(obj);
-                logDebug("Object REMOVED: " + obj->getParent()->getName() + " + " + obj->getName());
-        }
-}

hydranode/hncore/ed2k/serverlist.cpp

@@ -1200 +1200 @@
-uint32_t ServerList::getOperCount() const { 
-#ifndef NDEBUG
-6
+7
-#else
-5
+6
-#endif
-}
@@ -1224 +1224 @@
-                op.addArg(Operation::Argument("id", true, ODT_INT));
-                return op;
+        } else if (n == 5) {
+                Operation op("removeId", true);
+                op.addArg(Operation::Argument("id", true, ODT_INT));
+                return op;
-#ifndef NDEBUG
-        } else if (n == 5) {
@@ -1301 +1305 @@
-                                if (s) {
-                                        connect(s);
+                                }
+                        }
+                }
+                return;
+        } else if (op.getName() == "removeId") {
+                uint32_t id = boost::lexical_cast<uint32_t>(
+                        op.getArg("id").getValue()
+                );
+                if (id) {
+                        Object *obj = findChild(id);
+                        if (obj) {
+                                Server *s = dynamic_cast<Server*>(obj);
+                                if (s) {
+                                        m_list->erase(s);
+                                        delete s;
-                                }
-                        }
@@ -1331 +1350 @@
-                ClientList::instance().printDeadClients();
-                return;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        } else {
-connect(*i.first
+throw std::runtime_error("Unknown operation."
-        }
-}

hydranode/hngui/plugins/donkeypage.cpp

@@ -26 +26 @@
-#include <limits>
-#include <QPainter>
+#include <QMenu>
+#include <QContextMenuEvent>
-#include <boost/lexical_cast.hpp>
-
@@ -174 +176 @@
-                SLOT(connectToServer(QTreeWidgetItem*, int))
-        );
+        m_ui->serverList->installEventFilter(this);
-}
-
@@ -184 +187 @@
-        m_disableSorting = true;
-        while (i != obj->end()) {
-
+
+
+
-                ++i;
-        }
@@ -200 +205 @@
-                QString id = QString::fromStdString(obj->getData(2));
-                ServerListItem *cur = m_list.value(curServer.toUInt());
-cur && 
+
-                        for (int i = 0; i < m_currentServer->columnCount();++i){
-                                QFont f(m_currentServer->font(i));
@@ -342 +347 @@
-        m_serverList->doOper("connectId", args);
-}
+
+void DonkeyPage::removeServer(QTreeWidgetItem *it) {
+        ServerListItem *server = dynamic_cast<ServerListItem*>(it);
+        if (!server) {
+                return;
+        }
+        std::map<std::string, std::string> args;
+        args["id"] = boost::lexical_cast<std::string>(server->m_data->getId());
+        m_serverList->doOper("removeId", args);
+}
+
+bool DonkeyPage::eventFilter(QObject *obj, QEvent *evt) {
+        if (obj == m_ui->serverList && evt->type() == QEvent::ContextMenu) {
+                QContextMenuEvent *e = dynamic_cast<QContextMenuEvent*>(evt);
+                if (!e) {
+                        return false;
+                }
+                QTreeWidgetItem *it = m_ui->serverList->itemAt(
+                        m_ui->serverList->viewport()->mapFrom((QWidget*)obj, e->pos())
+                );
+                if (!it) {
+                        return false;
+                }
+                if (!m_ui->serverList->isItemSelected(it)) {
+                        if (e->modifiers() == Qt::NoModifier) {
+                                QList<QTreeWidgetItem*> items(
+                                        m_ui->serverList->selectedItems()
+                                );
+                                Q_FOREACH(QTreeWidgetItem *i, items) {
+                                        m_ui->serverList->setItemSelected(
+                                                i, false
+                                        );
+                                }
+                        }
+                        m_ui->serverList->setItemSelected(it, true);
+                }
+
+                QMenu menu(this);
+                QAction *con = menu.addAction("Connect");
+                QAction *rem = menu.addAction(
+                        QIcon("/transfer/icons/cancel16"), "Remove"
+                );
+                QAction *ret = menu.exec(e->globalPos());
+                if (ret && ret == rem) {
+                        QList<QTreeWidgetItem*> items(
+                                m_ui->serverList->selectedItems()
+                        );
+                        Q_FOREACH(QTreeWidgetItem *s, items) {
+                                removeServer(s);
+                        }
+                } else if (ret && ret == con) {
+                        connectToServer(it, 0);
+                }
+        }
+        return false;
+}
+

hydranode/hngui/plugins/donkeypage.h

@@ -58 +58 @@
-public Q_SLOTS:
-        void connectToServer(QTreeWidgetItem *it, int col);
+        void removeServer(QTreeWidgetItem *it);
+protected:
+        bool eventFilter(QObject *obj, QEvent *evt);
-private:
-        void gotServers(Engine::ObjectPtr obj);

hydranode/hngui/plugins/donkeypage_ui.ui

@@ -33 +33 @@
-     <property name="alternatingRowColors" >
-      <bool>true</bool>
+     </property>
+     <property name="selectionMode" >
+      <enum>QAbstractItemView::ExtendedSelection</enum>
-     </property>
-     <property name="rootIsDecorated" >