More UI polish

REDasmOrg · Nov 29, 2018 · c1d8096 · c1d8096
1 parent 8aeb16e
commit c1d8096
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 27 deletions.
diff --git a/models/disassemblermodel.cpp b/models/disassemblermodel.cpp
@@ -12,13 +12,3 @@ QVariant DisassemblerModel::headerData(int section, Qt::Orientation orientation,
 
     return QVariant();
 }
-
-QVariant DisassemblerModel::data(const QModelIndex &index, int role) const
-{
-    Q_UNUSED(index)
-
-    if(role == Qt::TextAlignmentRole)
-        return Qt::AlignCenter;
-
-    return QVariant();
-}
diff --git a/models/disassemblermodel.h b/models/disassemblermodel.h
@@ -12,16 +12,14 @@ class DisassemblerModel : public QAbstractListModel
     Q_OBJECT
 
     public:
-        explicit DisassemblerModel(QObject *parent = 0);
+        explicit DisassemblerModel(QObject *parent = NULL);
 
     public:
         virtual void setDisassembler(REDasm::DisassemblerAPI *disassembler);
         virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const;
-        virtual QVariant data(const QModelIndex &index, int role) const;
 
     protected:
         REDasm::DisassemblerAPI* m_disassembler;
-        bool m_defaultfont;
 };
 
 #endif // DISASSEMBLERMODEL_H
diff --git a/models/listingitemmodel.cpp b/models/listingitemmodel.cpp
@@ -69,7 +69,7 @@ QVariant ListingItemModel::data(const QModelIndex &index, int role) const
     REDasm::SymbolPtr symbol = m_disassembler->document()->symbol(item->address);
 
     if(!symbol)
-        return DisassemblerModel::data(index, role);
+        return QVariant();
 
     if(role == Qt::DisplayRole)
     {
@@ -113,7 +113,7 @@ QVariant ListingItemModel::data(const QModelIndex &index, int role) const
             return THEME_VALUE("string_fg");
     }
 
-    return DisassemblerModel::data(index, role);
+    return QVariant();
 }
 
 bool ListingItemModel::isItemAllowed(REDasm::ListingItem *item) const

diff --git a/models/referencesmodel.cpp b/models/referencesmodel.cpp
@@ -94,8 +94,6 @@ QVariant ReferencesModel::data(const QModelIndex &index, int role) const
             }
         }
     }
-    else if((role == Qt::TextAlignmentRole) && (index.column() > 0))
-        return Qt::AlignCenter;
 
     return QVariant();
 }

diff --git a/models/segmentsmodel.cpp b/models/segmentsmodel.cpp
@@ -5,15 +5,12 @@
 
 #define ADD_SEGMENT_TYPE(s, t) { if(!s.isEmpty()) s += " | ";  s += t; }
 
-SegmentsModel::SegmentsModel(QObject *parent) : ListingItemModel(REDasm::ListingItem::SegmentItem, parent)
-{
-
-}
+SegmentsModel::SegmentsModel(QObject *parent) : ListingItemModel(REDasm::ListingItem::SegmentItem, parent) { }
 
 QVariant SegmentsModel::data(const QModelIndex &index, int role) const
 {
     if(!m_disassembler)
-        return DisassemblerModel::data(index, role);
+        return QVariant();
 
     if(role == Qt::DisplayRole)
     {
@@ -39,7 +36,7 @@ QVariant SegmentsModel::data(const QModelIndex &index, int role) const
         return THEME_VALUE("address_list_fg");
     }
 
-    return DisassemblerModel::data(index, role);
+    return QVariant();
 }
 
 QVariant SegmentsModel::headerData(int section, Qt::Orientation orientation, int role) const

diff --git a/models/segmentsmodel.h b/models/segmentsmodel.h
@@ -8,7 +8,7 @@ class SegmentsModel : public ListingItemModel
     Q_OBJECT
 
     public:
-        explicit SegmentsModel(QObject *parent = 0);
+        explicit SegmentsModel(QObject *parent = NULL);
 
     public:
         virtual QVariant data(const QModelIndex &index, int role) const;

diff --git a/models/symboltablemodel.h b/models/symboltablemodel.h
@@ -8,7 +8,7 @@ class SymbolTableModel : public ListingItemModel
     Q_OBJECT
 
     public:
-        explicit SymbolTableModel(u32 itemtype, QObject *parent = nullptr);
+        explicit SymbolTableModel(u32 itemtype, QObject *parent = NULL);
         void setSymbolFlags(u32 symbolflags);
 
     protected:

diff --git a/widgets/disassemblerview/disassemblerview.cpp b/widgets/disassemblerview/disassemblerview.cpp
@@ -17,8 +17,8 @@ DisassemblerView::DisassemblerView(QPushButton *pbstatus, QLineEdit *lefilter, Q
     ui->vSplitter->setSizes((QList<int>() << this->width() * 0.70
                                            << this->width() * 0.30));
 
-    ui->hSplitter->setSizes((QList<int>() << this->width() * 0.30
-                                          << this->width() * 0.70));
+    ui->hSplitter->setSizes((QList<int>() << this->width() * 0.25
+                                          << this->width() * 0.75));
 
     m_disassemblerlistingview = new DisassemblerListingView(ui->stackedWidget);
     m_disassemblergraphview = new DisassemblerGraphView(ui->stackedWidget);