Plugins::WakeOnLan: add toolbar

Author: KangLin

Plugins/WakeOnLan/FrmWakeOnLan.cpp

@@ -1,3 +1,5 @@
+// Author: Kang Lin <kl222@126.com>
+
 #include <QLoggingCategory>
 #include <QMessageBox>
 
@@ -54,7 +56,7 @@ CFrmWakeOnLan::CFrmWakeOnLan(CWakeOnLanModel *pModel, QWidget *parent)
     QHeaderView::ResizeToContents：3 根据内容改变列宽，用户与程序不能改变列宽
     */
     ui->tableView->horizontalHeader()->setSectionResizeMode(
-        QHeaderView::Interactive);
+        QHeaderView::ResizeToContents);
     //以下设置列宽函数必须要数据加载完成后使用,才能应用
     //See: https://blog.csdn.net/qq_40450386/article/details/86083759
     //ui->tableView->resizeColumnsToContents(); //设置所有列宽度自适应内容
@@ -91,6 +93,11 @@ QModelIndexList CFrmWakeOnLan::GetSelect()
     return ui->tableView->selectionModel()->selectedRows();
 }
 
+QToolBar* CFrmWakeOnLan::GetToolBar()
+{
+    return ui->toolBar;
+}
+
 bool CFrmWakeOnLan::eventFilter(QObject *watched, QEvent *event)
 {
     if(ui->tableView == watched)

Plugins/WakeOnLan/FrmWakeOnLan.h

@@ -1,8 +1,10 @@
+// Author: Kang Lin <kl222@126.com>
+
 #ifndef FRMWAKEONLAN_H
 #define FRMWAKEONLAN_H
 
 #include <QWidget>
-
+#include <QToolBar>
 #include "WakeOnLanModel.h"
 
 namespace Ui {
@@ -19,6 +21,8 @@ class CFrmWakeOnLan : public QWidget
     ~CFrmWakeOnLan();
     QModelIndex GetCurrentIndex();
     QModelIndexList GetSelect();
+    QToolBar* GetToolBar();
+
 public Q_SLOTS:
     void slotRemoveRow();
 Q_SIGNALS:

Plugins/WakeOnLan/FrmWakeOnLan.ui

@@ -15,6 +15,19 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
+    <widget class="QToolBar" name="toolBar">
+     <property name="windowTitle">
+      <string>toolBar</string>
+     </property>
+     <attribute name="toolBarArea">
+      <enum>TopToolBarArea</enum>
+     </attribute>
+     <attribute name="toolBarBreak">
+      <bool>false</bool>
+     </attribute>
+    </widget>
+   </item>
+   <item row="1" column="0">
     <widget class="QTableView" name="tableView">
      <property name="sortingEnabled">
       <bool>false</bool>

Plugins/WakeOnLan/OperateWakeOnLan.cpp

@@ -47,8 +47,11 @@ int COperateWakeOnLan::Initial()
     if(!m_pModel)
         return -1;
     m_pView = new CFrmWakeOnLan(m_pModel);
-    if(!m_pView) return -2;
+    if(!m_pView) return -1;
+    QToolBar* pToolBar = m_pView->GetToolBar();
+    if(!pToolBar) return -1;
     m_pView->setWindowTitle(plugin->Name());
+
     check = connect(m_pView, SIGNAL(sigViewerFocusIn(QWidget*)),
                     this, SIGNAL(sigViewerFocusIn(QWidget*)));
     Q_ASSERT(check);
@@ -72,12 +75,13 @@ int COperateWakeOnLan::Initial()
                      });
     m_Menu.addSeparator();
 
-    m_Menu.addAction(QIcon::fromTheme("view-refresh"), tr("Refresh"),
+    QAction* pRefresh = m_Menu.addAction(QIcon::fromTheme("view-refresh"), tr("Refresh"),
                      this, [&](){
                          foreach(auto p, m_pModel->m_Data)
                          m_Arp.GetMac(p);
                      });
-    m_Menu.addAction(
+    pToolBar->addAction(pRefresh);
+    QAction* pMac = m_Menu.addAction(
         QIcon::fromTheme("mac"), tr("Get mac address"),
         this, [&](){
             if(!m_pModel || !m_pView)
@@ -89,7 +93,8 @@ int COperateWakeOnLan::Initial()
                     p->SetHostState(CParameterWakeOnLan::HostState::GetMac);
             }
         });
-    m_Menu.addAction(
+    pToolBar->addAction(pMac);
+    QAction* pWal = m_Menu.addAction(
         QIcon::fromTheme("lan"), tr("Wake on lan"),
         this, [&](){
             if(!m_pModel || !m_pView)
@@ -101,11 +106,14 @@ int COperateWakeOnLan::Initial()
                     p->SetHostState(CParameterWakeOnLan::HostState::WakeOnLan);
             }
         });
+    pToolBar->addAction(pWal);
+    pToolBar->addSeparator();
     m_Menu.addSeparator();
 
-    m_Menu.addAction(QIcon::fromTheme("list-add"), tr("Add"),
+    QAction* pAdd = m_Menu.addAction(QIcon::fromTheme("list-add"), tr("Add"),
                      this, SLOT(slotAdd()));
-    m_Menu.addAction(QIcon::fromTheme("document-edit"), tr("Edit"),
+    pToolBar->addAction(pAdd);
+    QAction* pEdit = m_Menu.addAction(QIcon::fromTheme("document-edit"), tr("Edit"),
                      this, [&](){
                          QSharedPointer<CParameterWakeOnLan> para
                              = m_pModel->GetData(m_pView->GetCurrentIndex());
@@ -120,8 +128,10 @@ int COperateWakeOnLan::Initial()
                          dlg.SetParameter(para.data());
                          RC_SHOW_WINDOW(&dlg);
                      });
-    m_Menu.addAction(QIcon::fromTheme("list-remove"), tr("Remove"),
+    pToolBar->addAction(pEdit);
+    QAction* pRemove = m_Menu.addAction(QIcon::fromTheme("list-remove"), tr("Remove"),
                      m_pView, SLOT(slotRemoveRow()));
+    pToolBar->addAction(pRemove);
 
     return 0;
 }

Plugins/WakeOnLan/WakeOnLanModel.cpp

@@ -192,6 +192,10 @@ int CWakeOnLanModel::AddItem(QSharedPointer<CParameterWakeOnLan> para)
     if(!para)
         return -1;
     QString szIp = para->m_Net.GetHost();
+    if(szIp.isEmpty()) {
+        qCritical(log) << "The ip is empty";
+        return -1;
+    }
     foreach(auto p, m_Data)
     {
         if(p->m_Net.GetHost() == szIp){