diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/gui/conversation.cc | 18 | ||||
| -rw-r--r-- | src/gui/conversation.h | 6 |
3 files changed, 11 insertions, 19 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d9624fe3..a504ac00 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2013-04-02 Gabriel Dos Reis <gdr@integrable-solutions.net> + * gui/conversation.h (Question::leaveEvent): Remove. + (Question::focusOutEvent): Likewise. + * gui/conversation.cc: Remove corresponding definitions. + +2013-04-02 Gabriel Dos Reis <gdr@integrable-solutions.net> + * gui/conversation.cc (font_units): Rename from em_metrics. Adjust callers. (Answer::Answer): Use raised frame style. diff --git a/src/gui/conversation.cc b/src/gui/conversation.cc index 16948296..5d3fda7a 100644 --- a/src/gui/conversation.cc +++ b/src/gui/conversation.cc @@ -121,6 +121,7 @@ namespace OpenAxiom { // -------------- Question::Question(Exchange& e) : Base(&e), parent(&e) { setBackgroundRole(QPalette::AlternateBase); + setFrame(true); } void Question::focusInEvent(QFocusEvent* e) { @@ -129,25 +130,12 @@ namespace OpenAxiom { Base::focusInEvent(e); } - void Question::focusOutEvent(QFocusEvent* e) { - setFrame(false); - update(); - Base::focusOutEvent(e); - } - void Question::enterEvent(QEvent* e) { setFrame(true); update(); Base::enterEvent(e); } - void Question::leaveEvent(QEvent* e) { - if (not hasFocus()) - setFrame(false); - update(); - Base::leaveEvent(e); - } - // ------------ // -- Answer -- // ------------ @@ -163,7 +151,7 @@ namespace OpenAxiom { // Return a monospace font static QFont monospace_font() { - QFont f("Courier"); + QFont f("Monaco", 11); f.setStyleHint(QFont::TypeWriter); return f; } @@ -273,7 +261,7 @@ namespace OpenAxiom { // Default number of characters per question line. const int columns = 80; - const int lines = 25; + const int lines = 40; static QSize minimum_preferred_size(const Conversation* conv) { diff --git a/src/gui/conversation.h b/src/gui/conversation.h index 8f379f8d..31883a8f 100644 --- a/src/gui/conversation.h +++ b/src/gui/conversation.h @@ -81,10 +81,8 @@ namespace OpenAxiom { Exchange* exchange() const { return parent; } protected: - void enterEvent(QEvent*); - void leaveEvent(QEvent*); - void focusInEvent(QFocusEvent*); - void focusOutEvent(QFocusEvent*); + void enterEvent(QEvent*); + void focusInEvent(QFocusEvent*); private: Exchange* const parent; |