diff --git a/src/collapsableperipheralwidget.cpp b/src/collapsableperipheralwidget.cpp
--- a/src/collapsableperipheralwidget.cpp
+++ b/src/collapsableperipheralwidget.cpp
@@ -53,6 +53,14 @@ void CollapsablePeripheralWidget::change
}
}
+void CollapsablePeripheralWidget::paintEvent(QPaintEvent *)
+{
+ QStyleOption opt;
+ opt.init(this);
+ QPainter p(this);
+ style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+}
+
void CollapsablePeripheralWidget::collapse()
{
this->m_periph->setVisible(m_collapsed);
diff --git a/src/collapsableperipheralwidget.h b/src/collapsableperipheralwidget.h
--- a/src/collapsableperipheralwidget.h
+++ b/src/collapsableperipheralwidget.h
@@ -36,7 +36,7 @@ public:
peripheralWidget* getPeripheralWidget();
protected:
void changeEvent(QEvent *e);
-
+ void paintEvent(QPaintEvent *);
public slots:
void collapse();
void setName(const QString& name);
diff --git a/src/collapsableperipheralwidget.ui b/src/collapsableperipheralwidget.ui
--- a/src/collapsableperipheralwidget.ui
+++ b/src/collapsableperipheralwidget.ui
@@ -6,8 +6,8 @@
0
0
- 845
- 249
+ 833
+ 192
@@ -20,10 +20,7 @@
Form
- QWidget#CollapsablePeripheralWidget {
- border: 1px solid gray;
- border-radius: 9px;
-}
+
-
@@ -34,6 +31,9 @@
0
+
+ Qt::NoFocus
+
diff --git a/src/socregsviewernew.cpp b/src/socregsviewernew.cpp
--- a/src/socregsviewernew.cpp
+++ b/src/socregsviewernew.cpp
@@ -9,6 +9,14 @@ SocRegsViewerNew::SocRegsViewerNew(const
this->ui->socName->setText(name);
}
+SocRegsViewerNew::SocRegsViewerNew(QWidget *parent):
+ QWidget(parent),
+ ui(new Ui::SocRegsViewerNew)
+{
+ ui->setupUi(this);
+ this->ui->socName->setText("No name");
+}
+
SocRegsViewerNew::~SocRegsViewerNew()
{
delete ui;
@@ -66,7 +74,7 @@ void SocRegsViewerNew::periphUp(peripher
{
p_peripherals.at(senderIndex)->leave();
p_peripherals.at(index-1)->enter(cursorIndex,false);
-// ensureWidgetVisible(p_peripherals.at(index-1));
+ // ensureWidgetVisible(p_peripherals.at(index-1));
break;
}
index--;
@@ -86,7 +94,7 @@ void SocRegsViewerNew::periphDown(periph
{
p_peripherals.at(senderIndex)->leave();
p_peripherals.at(index+1)->enter(cursorIndex);
-// ensureWidgetVisible(p_peripherals.at(index+1));
+ // ensureWidgetVisible(p_peripherals.at(index+1));
break;
}
index++;
@@ -94,6 +102,11 @@ void SocRegsViewerNew::periphDown(periph
}
}
+void SocRegsViewerNew::setSocName(const QString &name)
+{
+ this->ui->socName->setText(name);
+}
+
void SocRegsViewerNew::changeEvent(QEvent *e)
{
QWidget::changeEvent(e);
diff --git a/src/socregsviewernew.h b/src/socregsviewernew.h
--- a/src/socregsviewernew.h
+++ b/src/socregsviewernew.h
@@ -15,6 +15,7 @@ class SocRegsViewerNew : public QWidget
public:
explicit SocRegsViewerNew(const QString &name, QWidget *parent = 0);
+ explicit SocRegsViewerNew(QWidget *parent = 0);
~SocRegsViewerNew();
peripheralWidget *peripheral(int index);
@@ -26,6 +27,7 @@ public slots:
void periphClicked(peripheralWidget* sender);
void periphUp(peripheralWidget* sender,int cursorIndex);
void periphDown(peripheralWidget* sender,int cursorIndex);
+ void setSocName(const QString& name);
protected:
void changeEvent(QEvent *e);
diff --git a/src/socregsviewernew.ui b/src/socregsviewernew.ui
--- a/src/socregsviewernew.ui
+++ b/src/socregsviewernew.ui
@@ -14,10 +14,7 @@
Form
-
-
-
-
- -
+
-
true
@@ -28,7 +25,7 @@
0
0
693
- 302
+ 337
@@ -46,13 +43,6 @@
- -
-
-
- Root Plugin
-
-
-