conflicts fixed

plugins/gui/include/gui/gatelibrary_management/gatelibrary_manager.h

@@ -32,6 +32,8 @@
 #include <QFrame>
 #include <QGridLayout>
 #include <QTableView>
+#include <QPushButton>
+#include <QTabWidget>
 
 namespace hal
 {
@@ -61,11 +63,19 @@ namespace hal
 
 
     private:
+        QWidget* createGeneralWidget();
+        QWidget* createPinWidget();
+        QWidget* createFlipFlopWidget();
+        QWidget* createBooleanFunctionWidget();
+        QTabWidget* mTabWidget;
         QGridLayout* mLayout;
-
+        QPushButton* mEditBtn;
+        QPushButton* mAddBtn;
         QTableView* mTableView;
         GatelibraryTableModel* mTableModel;
 
-        GateLibrary* mGateLibrary;
+        const GateLibrary* mGateLibrary;
+
+        bool mReadOnly = false;
     };
 }

plugins/gui/include/gui/gatelibrary_management/gatelibrary_table_model.h

@@ -26,13 +26,12 @@
 #pragma once
 
 #include "hal_core/defines.h"
+#include "hal_core/netlist/gate_library/gate_library.h"
 
 #include <QAbstractTableModel>
 #include <QList>
-
 #include <filesystem>
 
-
 namespace hal
 {
 
@@ -108,7 +107,7 @@ class GatelibraryTableModel : public QAbstractTableModel
      *
      * @param path - The file path
      */
-    void loadFile(const QString& path);
+    void loadFile(const GateLibrary* g);
 
 
 private:

plugins/gui/src/gatelibrary_management/gatelibrary_management_dialog.cpp

@@ -172,7 +172,7 @@ namespace hal
 
         if (!fileName.isNull())
         {
-            mTableModel->loadFile(fileName);
+            //mTableModel->loadFile(fileName);
         }
     }
 

plugins/gui/src/gatelibrary_management/gatelibrary_table_model.cpp

@@ -85,17 +85,11 @@ namespace hal
     }
 
 
-    void GatelibraryTableModel::loadFile(const QString& path)
+    void GatelibraryTableModel::loadFile(const GateLibrary* g)
     {
-        if (gPluginRelay->mGuiPluginTable)
-            gPluginRelay->mGuiPluginTable->loadFeature(FacExtensionInterface::FacGatelibParser);
-
-        std::filesystem::path stdPath = path.toStdString();
-        GateLibrary* g = gate_library_manager::load(stdPath, false);
 
         if (!g)
             return;
-        qInfo() << "adding gate:";
         beginResetModel();
 
         for (auto elem : g->get_gate_types())