aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmniTroid <davidskoland@gmail.com>2017-04-25 02:24:31 +0200
committerOmniTroid <davidskoland@gmail.com>2017-04-25 02:24:31 +0200
commit48f044087252ba1e1cb432b1a89505b001933c17 (patch)
treed41b84c3edbfb401d384d0fac55e1d42a974bfea
parent3f97df61744a402eeee3e820cbe860d9a21c8750 (diff)
started reworking evidence description
-rw-r--r--Attorney_Online_remake.pro6
-rw-r--r--aotextedit.cpp21
-rw-r--r--aotextedit.h23
-rw-r--r--courtroom.h3
-rw-r--r--evidence.cpp3
5 files changed, 51 insertions, 5 deletions
diff --git a/Attorney_Online_remake.pro b/Attorney_Online_remake.pro
index 7cb2c010..b0ccdeee 100644
--- a/Attorney_Online_remake.pro
+++ b/Attorney_Online_remake.pro
@@ -45,7 +45,8 @@ SOURCES += main.cpp\
aoevidencebutton.cpp \
charselect.cpp \
aotextarea.cpp \
- aolineedit.cpp
+ aolineedit.cpp \
+ aotextedit.cpp
HEADERS += lobby.h \
aoimage.h \
@@ -72,7 +73,8 @@ HEADERS += lobby.h \
aoblipplayer.h \
aoevidencebutton.h \
aotextarea.h \
- aolineedit.h
+ aolineedit.h \
+ aotextedit.h
unix:LIBS += -L$$PWD -lbass
win32:LIBS += "$$PWD/bass.dll"
diff --git a/aotextedit.cpp b/aotextedit.cpp
new file mode 100644
index 00000000..580067b4
--- /dev/null
+++ b/aotextedit.cpp
@@ -0,0 +1,21 @@
+#include "aotextedit.h"
+
+AOTextEdit::AOTextEdit(QWidget *parent) : QPlainTextEdit(parent)
+{
+ this->setReadOnly(true);
+
+ connect(this, SIGNAL(returnPressed()), this, SLOT(on_enter_pressed()));
+}
+
+void AOTextEdit::mouseDoubleClickEvent(QMouseEvent *e)
+{
+ QPlainTextEdit::mouseDoubleClickEvent(e);
+
+ this->setReadOnly(false);
+}
+
+void AOTextEdit::on_enter_pressed()
+{
+ this->setReadOnly(true);
+}
+
diff --git a/aotextedit.h b/aotextedit.h
new file mode 100644
index 00000000..85909c6e
--- /dev/null
+++ b/aotextedit.h
@@ -0,0 +1,23 @@
+#ifndef AOTEXTEDIT_H
+#define AOTEXTEDIT_H
+
+#include <QPlainTextEdit>
+
+class AOTextEdit : public QPlainTextEdit
+{
+ Q_OBJECT
+public:
+ AOTextEdit(QWidget *parent);
+
+protected:
+ void mouseDoubleClickEvent(QMouseEvent *e);
+
+signals:
+ void double_clicked();
+
+private slots:
+ void on_enter_pressed();
+
+};
+
+#endif // AOTEXTEDIT_H
diff --git a/courtroom.h b/courtroom.h
index e41ae28a..ec78f892 100644
--- a/courtroom.h
+++ b/courtroom.h
@@ -15,6 +15,7 @@
#include "aoevidencebutton.h"
#include "aotextarea.h"
#include "aolineedit.h"
+#include "aotextedit.h"
#include "datatypes.h"
#include <QMainWindow>
@@ -303,7 +304,7 @@ private:
AOButton *ui_evidence_right;
AOImage *ui_evidence_overlay;
AOButton *ui_evidence_x;
- QPlainTextEdit *ui_evidence_description;
+ AOTextEdit *ui_evidence_description;
AOImage *ui_char_select_background;
diff --git a/evidence.cpp b/evidence.cpp
index e653a34f..aeaa2b26 100644
--- a/evidence.cpp
+++ b/evidence.cpp
@@ -23,8 +23,7 @@ void Courtroom::construct_evidence()
ui_evidence_x = new AOButton(ui_evidence_overlay, ao_app);
ui_evidence_x->setText("X");
- ui_evidence_description = new QPlainTextEdit(ui_evidence_overlay);
- ui_evidence_description->setReadOnly(true);
+ ui_evidence_description = new AOTextEdit(ui_evidence_overlay);
ui_evidence_description->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"color: white;");