From 9008ec8d9d41e8ce523ecad5ad310fed2dfb3d8c Mon Sep 17 00:00:00 2001 From: oldmud0 <3421260-oldmud0@users.noreply.gitlab.com> Date: Mon, 21 Jan 2019 02:49:00 +0000 Subject: Remove constexpr from aoapplication.h --- include/aoapplication.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/aoapplication.h b/include/aoapplication.h index 44aef7a8..e6980308 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -94,9 +94,9 @@ public: //////////////////versioning/////////////// - constexpr int get_release() const { return RELEASE; } - constexpr int get_major_version() const { return MAJOR_VERSION; } - constexpr int get_minor_version() const { return MINOR_VERSION; } + int get_release() const { return RELEASE; } + int get_major_version() const { return MAJOR_VERSION; } + int get_minor_version() const { return MINOR_VERSION; } QString get_version_string(); /////////////////////////////////////////// -- cgit From 8a23f1004027d3f3de9d97e55e9a97fd73f3eb74 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 00:27:22 +0100 Subject: gcc didn't like that --- include/aoapplication.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/aoapplication.h b/include/aoapplication.h index 44aef7a8..6c8039cc 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -94,9 +94,9 @@ public: //////////////////versioning/////////////// - constexpr int get_release() const { return RELEASE; } - constexpr int get_major_version() const { return MAJOR_VERSION; } - constexpr int get_minor_version() const { return MINOR_VERSION; } + const int get_release() const { return RELEASE; } + const int get_major_version() const { return MAJOR_VERSION; } + const int get_minor_version() const { return MINOR_VERSION; } QString get_version_string(); /////////////////////////////////////////// -- cgit From 0b6f376f8f635bfcfd72f621a1077a35efc72342 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 19:53:06 +0100 Subject: qt can play the blips just fine --- include/aoblipplayer.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'include') diff --git a/include/aoblipplayer.h b/include/aoblipplayer.h index aebba77d..2bbe7187 100644 --- a/include/aoblipplayer.h +++ b/include/aoblipplayer.h @@ -1,13 +1,19 @@ #ifndef AOBLIPPLAYER_H #define AOBLIPPLAYER_H +#if defined(BASSAUDIO) #include "bass.h" +#elif defined(QTAUDIO) +#include +#endif + #include "aoapplication.h" #include #include #include +#if defined(BASSAUDIO) class AOBlipPlayer { public: @@ -26,5 +32,41 @@ private: int m_volume; HSTREAM m_stream_list[5]; }; +#elif defined(QTAUDIO) +class AOBlipPlayer +{ +public: + AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app); + + void set_blips(QString p_sfx); + void blip_tick(); + void set_volume(int p_volume); + + int m_cycle = 0; + +private: + QSoundEffect m_blips; + QWidget *m_parent; + AOApplication *ao_app; + + int m_volume; + //HSTREAM m_stream_list[5]; +}; +#else +class AOBlipPlayer +{ +public: + AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app); + + void set_blips(QString p_sfx); + void blip_tick(); + void set_volume(int p_volume); + +private: + QWidget *m_parent; + AOApplication *ao_app; +}; +#endif + #endif // AOBLIPPLAYER_H -- cgit From 71da60b5d6f77629b73fd232f97bed2ecaefb4c3 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 20:14:54 +0100 Subject: sfx tested and works --- include/aosfxplayer.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'include') diff --git a/include/aosfxplayer.h b/include/aosfxplayer.h index 30cbe9d3..5b82534c 100644 --- a/include/aosfxplayer.h +++ b/include/aosfxplayer.h @@ -1,13 +1,19 @@ #ifndef AOSFXPLAYER_H #define AOSFXPLAYER_H +#if defined(BASSAUDIO) #include "bass.h" +#elif defined(QTAUDIO) +#include +#endif + #include "aoapplication.h" #include #include #include +#if defined(BASSAUDIO) class AOSfxPlayer { public: @@ -24,5 +30,39 @@ private: int m_volume = 0; HSTREAM m_stream; }; +#elif defined(QTAUDIO) +class AOSfxPlayer +{ +public: + AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app); + + void play(QString p_sfx, QString p_char = "", QString shout = ""); + void stop(); + void set_volume(int p_volume); + +private: + QSoundEffect m_sfx; + QWidget *m_parent; + AOApplication *ao_app; + + int m_volume = 0; +}; +#else +class AOSfxPlayer +{ +public: + AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app); + + void play(QString p_sfx, QString p_char = "", QString shout = ""); + void stop(); + void set_volume(int p_volume); + +private: + QWidget *m_parent; + AOApplication *ao_app; + + int m_volume = 0; +}; +#endif #endif // AOSFXPLAYER_H -- cgit From 1514ffea6ad747fc93f98752abb8f82acc9dc9bd Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 20:47:47 +0100 Subject: qt music --- include/aomusicplayer.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'include') diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h index 560a7f90..b34267c9 100644 --- a/include/aomusicplayer.h +++ b/include/aomusicplayer.h @@ -1,13 +1,18 @@ #ifndef AOMUSICPLAYER_H #define AOMUSICPLAYER_H +#if defined(BASSAUDIO) #include "bass.h" +#elif defined(QTAUDIO) +#include +#endif #include "aoapplication.h" #include #include #include +#if defined(BASSAUDIO) class AOMusicPlayer { public: @@ -24,5 +29,37 @@ private: int m_volume = 0; HSTREAM m_stream; }; +#elif defined(QTAUDIO) +class AOMusicPlayer +{ +public: + AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app); + ~AOMusicPlayer(); + + void play(QString p_song); + void set_volume(int p_value); + +private: + QMediaPlayer m_player; + QWidget *m_parent; + AOApplication *ao_app; + + int m_volume = 0; +}; +#else +class AOMusicPlayer +{ +public: + AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app); + ~AOMusicPlayer(); + + void play(QString p_song); + void set_volume(int p_value); + +private: + QWidget *m_parent; + AOApplication *ao_app; +}; +#endif #endif // AOMUSICPLAYER_H -- cgit From 1504aaf6b2df422405b2cc6bd6e4f79de36e53c4 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 13 Mar 2019 13:05:10 +0100 Subject: saves space i guess --- include/aoblipplayer.h | 40 ++++------------------------------------ include/aosfxplayer.h | 38 +++----------------------------------- 2 files changed, 7 insertions(+), 71 deletions(-) (limited to 'include') diff --git a/include/aoblipplayer.h b/include/aoblipplayer.h index 2bbe7187..102a0408 100644 --- a/include/aoblipplayer.h +++ b/include/aoblipplayer.h @@ -13,7 +13,7 @@ #include #include -#if defined(BASSAUDIO) + class AOBlipPlayer { public: @@ -30,43 +30,11 @@ private: AOApplication *ao_app; int m_volume; + #if defined(BASSAUDIO) HSTREAM m_stream_list[5]; -}; -#elif defined(QTAUDIO) -class AOBlipPlayer -{ -public: - AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app); - - void set_blips(QString p_sfx); - void blip_tick(); - void set_volume(int p_volume); - - int m_cycle = 0; - -private: + #elif defined(QTAUDIO) QSoundEffect m_blips; - QWidget *m_parent; - AOApplication *ao_app; - - int m_volume; - //HSTREAM m_stream_list[5]; + #endif }; -#else -class AOBlipPlayer -{ -public: - AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app); - - void set_blips(QString p_sfx); - void blip_tick(); - void set_volume(int p_volume); - -private: - QWidget *m_parent; - AOApplication *ao_app; -}; -#endif - #endif // AOBLIPPLAYER_H diff --git a/include/aosfxplayer.h b/include/aosfxplayer.h index 5b82534c..4b976852 100644 --- a/include/aosfxplayer.h +++ b/include/aosfxplayer.h @@ -13,7 +13,6 @@ #include #include -#if defined(BASSAUDIO) class AOSfxPlayer { public: @@ -26,43 +25,12 @@ public: private: QWidget *m_parent; AOApplication *ao_app; - - int m_volume = 0; + #if defined(BASSAUDIO) HSTREAM m_stream; -}; -#elif defined(QTAUDIO) -class AOSfxPlayer -{ -public: - AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app); - - void play(QString p_sfx, QString p_char = "", QString shout = ""); - void stop(); - void set_volume(int p_volume); - -private: + #elif defined(QTAUDIO) QSoundEffect m_sfx; - QWidget *m_parent; - AOApplication *ao_app; - + #endif int m_volume = 0; }; -#else -class AOSfxPlayer -{ -public: - AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app); - - void play(QString p_sfx, QString p_char = "", QString shout = ""); - void stop(); - void set_volume(int p_volume); - -private: - QWidget *m_parent; - AOApplication *ao_app; - - int m_volume = 0; -}; -#endif #endif // AOSFXPLAYER_H -- cgit From 2e4f0117b067c6d795a7d42fe23162d41260ff74 Mon Sep 17 00:00:00 2001 From: Cerapter Date: Thu, 9 May 2019 23:49:20 +0200 Subject: Text is now advanced based on graphemes, rather than bytes. --- include/courtroom.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/courtroom.h b/include/courtroom.h index ec9f9ef0..cc08f65d 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -48,6 +48,7 @@ #include #include #include +#include #include -- cgit From 5eccabcad15a52691228aded1d9c1fd5074fb70e Mon Sep 17 00:00:00 2001 From: David Skoland Date: Fri, 12 Jul 2019 23:00:25 +0000 Subject: Less insane debugging; minor refactoring (!75) --- include/aoapplication.h | 1 + include/aoevidencebutton.h | 2 ++ include/courtroom.h | 12 ++++-------- include/networkmanager.h | 7 ++++--- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/aoapplication.h b/include/aoapplication.h index e6980308..60856ee4 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -22,6 +22,7 @@ #include #include #include +#include class NetworkManager; class Lobby; diff --git a/include/aoevidencebutton.h b/include/aoevidencebutton.h index 27fb84b3..80b747cd 100644 --- a/include/aoevidencebutton.h +++ b/include/aoevidencebutton.h @@ -35,8 +35,10 @@ protected: void enterEvent(QEvent *e); void leaveEvent(QEvent *e); void mouseDoubleClickEvent(QMouseEvent *e); + /* void dragLeaveEvent(QMouseEvent *e); void dragEnterEvent(QMouseEvent *e); + */ signals: void evidence_clicked(int p_id); diff --git a/include/courtroom.h b/include/courtroom.h index cc08f65d..99a090b0 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -273,8 +272,6 @@ private: QVector arup_cms; QVector arup_locks; - QSignalMapper *char_button_mapper; - QVector ic_chatlog_history; // These map music row items and area row items to their actual IDs. @@ -538,6 +535,7 @@ private: void construct_char_select(); void set_char_select(); void set_char_select_page(); + void char_clicked(int n_char); void put_button_in_place(int starting, int chars_on_this_page); void filter_character_list(); @@ -652,14 +650,12 @@ private slots: void on_char_select_left_clicked(); void on_char_select_right_clicked(); - void on_char_search_changed(const QString& newtext); - void on_char_taken_clicked(int newstate); - void on_char_passworded_clicked(int newstate); + void on_char_search_changed(); + void on_char_taken_clicked(); + void on_char_passworded_clicked(); void on_spectator_clicked(); - void char_clicked(int n_char); - void on_switch_area_music_clicked(); void on_casing_clicked(); diff --git a/include/networkmanager.h b/include/networkmanager.h index e28abfda..f26e658c 100644 --- a/include/networkmanager.h +++ b/include/networkmanager.h @@ -44,13 +44,14 @@ public: QString ms_nosrv_hostname = "master.aceattorneyonline.com"; #endif - const int ms_port = 27016; + const quint16 ms_port = 27016; const int timeout_milliseconds = 2000; - const int ms_reconnect_delay_ms = 7000; + // in seconds + const int ms_reconnect_delay = 7; // kind of arbitrary max buffer size - const size_t buffer_max_size = 16384; + #define BUFFER_MAX_SIZE 16384 bool ms_partial_packet = false; QString ms_temp_packet = ""; -- cgit From 82db3e226353183cf8337d993ba89ea265014d3a Mon Sep 17 00:00:00 2001 From: cents02 Date: Sat, 20 Jul 2019 16:33:33 +0000 Subject: Revert "More bug fixing." This reverts commit ca84ba516fc892deaeafc18b23ad5a06822b29f5 --- include/aoapplication.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/aoapplication.h b/include/aoapplication.h index 60856ee4..2eed7f23 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -195,6 +195,10 @@ public: //Returns the dimensions of widget with specified identifier from p_file pos_size_type get_element_dimensions(QString p_identifier, QString p_file); + //Returns the name of the font with p_identifier from p_file + QString get_font_name(QString p_identifier, QString p_file); + + //Returns the value of font_size with p_identifier from p_file int get_font_size(QString p_identifier, QString p_file); -- cgit From 2dbd0c148224bfb7bdd7538136df917e7d1f3a6a Mon Sep 17 00:00:00 2001 From: windrammer <31085911+likeawindrammer@users.noreply.github.com> Date: Mon, 22 Jul 2019 18:21:27 -0600 Subject: Remove C style char buffer in favor of QByteArray --- include/networkmanager.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include') diff --git a/include/networkmanager.h b/include/networkmanager.h index f26e658c..08b10db8 100644 --- a/include/networkmanager.h +++ b/include/networkmanager.h @@ -50,9 +50,6 @@ public: // in seconds const int ms_reconnect_delay = 7; - // kind of arbitrary max buffer size - #define BUFFER_MAX_SIZE 16384 - bool ms_partial_packet = false; QString ms_temp_packet = ""; -- cgit From e3187b682469ad414de72b708bb8240e83303f5f Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 27 Jul 2019 10:11:48 -0500 Subject: Bump version to 2.6.2 (#87) --- include/aoapplication.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/aoapplication.h b/include/aoapplication.h index f7103b87..67f9a0d5 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -305,7 +305,7 @@ public: private: const int RELEASE = 2; const int MAJOR_VERSION = 6; - const int MINOR_VERSION = 1; + const int MINOR_VERSION = 2; QString current_theme = "default"; -- cgit From 762702aff852701c44eb0f07ee02c0fdfd1fd85b Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Tue, 29 May 2018 19:21:49 -0500 Subject: Make all strings translatable --- include/discord_rich_presence.h | 4 ++++ include/networkmanager.h | 2 ++ 2 files changed, 6 insertions(+) (limited to 'include') diff --git a/include/discord_rich_presence.h b/include/discord_rich_presence.h index e7ecc6ef..4115b516 100644 --- a/include/discord_rich_presence.h +++ b/include/discord_rich_presence.h @@ -5,6 +5,8 @@ #include #include #include +#include + #include #include @@ -16,6 +18,8 @@ namespace AttorneyOnline { class Discord { + Q_DECLARE_TR_FUNCTIONS(Discord) + private: const char* APPLICATION_ID = "399779271737868288"; std::string server_name, server_id; diff --git a/include/networkmanager.h b/include/networkmanager.h index 08b10db8..7584b69c 100644 --- a/include/networkmanager.h +++ b/include/networkmanager.h @@ -14,6 +14,8 @@ #undef MS_FAILOVER_SUPPORTED #endif +#undef MS_FAILOVER_SUPPORTED + #include "aopacket.h" #include "aoapplication.h" -- cgit From 3f0ff19615c97d49cbfb0cd9ed1d13432793e920 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 29 Jul 2019 21:58:49 +0200 Subject: what was gbp thinking --- include/networkmanager.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/networkmanager.h b/include/networkmanager.h index 7584b69c..08b10db8 100644 --- a/include/networkmanager.h +++ b/include/networkmanager.h @@ -14,8 +14,6 @@ #undef MS_FAILOVER_SUPPORTED #endif -#undef MS_FAILOVER_SUPPORTED - #include "aopacket.h" #include "aoapplication.h" -- cgit From 078ad79b65692644a1d7230b4cfb9277a16d0310 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 5 Aug 2019 23:30:00 +0200 Subject: language setting --- include/aooptionsdialog.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h index a65e3f59..83b84cbc 100644 --- a/include/aooptionsdialog.h +++ b/include/aooptionsdialog.h @@ -55,6 +55,8 @@ private: QLineEdit *ui_ms_textbox; QLabel *ui_discord_lbl; QCheckBox *ui_discord_cb; + QLabel *ui_language_label; + QComboBox *ui_language_combobox; QWidget *ui_callwords_tab; QWidget *ui_callwords_widget; -- cgit From 05debed60ba1adaa4f454010164caf554248a29e Mon Sep 17 00:00:00 2001 From: David Skoland Date: Tue, 6 Aug 2019 01:11:53 +0200 Subject: removed meaningless modifiers (see https://software.intel.com/en-us/articles/cdiag858) --- include/aoapplication.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/aoapplication.h b/include/aoapplication.h index 67f9a0d5..af43cf3c 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -95,9 +95,9 @@ public: //////////////////versioning/////////////// - const int get_release() const { return RELEASE; } - const int get_major_version() const { return MAJOR_VERSION; } - const int get_minor_version() const { return MINOR_VERSION; } + int get_release() const { return RELEASE; } + int get_major_version() const { return MAJOR_VERSION; } + int get_minor_version() const { return MINOR_VERSION; } QString get_version_string(); /////////////////////////////////////////// -- cgit From 4700902551f80769b54cb452b0fcb794669c553b Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sat, 17 Aug 2019 20:47:41 +0200 Subject: fix qaudio volume --- include/aoblipplayer.h | 5 +++-- include/aosfxplayer.h | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/aoblipplayer.h b/include/aoblipplayer.h index 102a0408..68dca191 100644 --- a/include/aoblipplayer.h +++ b/include/aoblipplayer.h @@ -21,15 +21,16 @@ public: void set_blips(QString p_sfx); void blip_tick(); - void set_volume(int p_volume); + void set_volume(qreal p_volume); + void set_volume_internal(qreal p_volume); int m_cycle = 0; private: QWidget *m_parent; AOApplication *ao_app; + qreal m_volume; - int m_volume; #if defined(BASSAUDIO) HSTREAM m_stream_list[5]; #elif defined(QTAUDIO) diff --git a/include/aosfxplayer.h b/include/aosfxplayer.h index 4b976852..5b4b41d8 100644 --- a/include/aosfxplayer.h +++ b/include/aosfxplayer.h @@ -20,17 +20,19 @@ public: void play(QString p_sfx, QString p_char = "", QString shout = ""); void stop(); - void set_volume(int p_volume); + void set_volume(qreal p_volume); + void set_volume_internal(qreal p_volume); private: QWidget *m_parent; AOApplication *ao_app; + qreal m_volume = 0; + #if defined(BASSAUDIO) HSTREAM m_stream; #elif defined(QTAUDIO) - QSoundEffect m_sfx; + QSoundEffect m_sfx; #endif - int m_volume = 0; }; #endif // AOSFXPLAYER_H -- cgit From 49be444d74cfdecdaa1090a2a51c19f70ae9b0b1 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sat, 17 Aug 2019 21:09:13 +0200 Subject: OOP :convenience_store: --- include/aoblipplayer.h | 3 ++- include/aosfxplayer.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/aoblipplayer.h b/include/aoblipplayer.h index 68dca191..44ca48bb 100644 --- a/include/aoblipplayer.h +++ b/include/aoblipplayer.h @@ -22,7 +22,6 @@ public: void set_blips(QString p_sfx); void blip_tick(); void set_volume(qreal p_volume); - void set_volume_internal(qreal p_volume); int m_cycle = 0; @@ -31,6 +30,8 @@ private: AOApplication *ao_app; qreal m_volume; + void set_volume_internal(qreal p_volume); + #if defined(BASSAUDIO) HSTREAM m_stream_list[5]; #elif defined(QTAUDIO) diff --git a/include/aosfxplayer.h b/include/aosfxplayer.h index 5b4b41d8..19d4bdf3 100644 --- a/include/aosfxplayer.h +++ b/include/aosfxplayer.h @@ -21,13 +21,14 @@ public: void play(QString p_sfx, QString p_char = "", QString shout = ""); void stop(); void set_volume(qreal p_volume); - void set_volume_internal(qreal p_volume); private: QWidget *m_parent; AOApplication *ao_app; qreal m_volume = 0; + void set_volume_internal(qreal p_volume); + #if defined(BASSAUDIO) HSTREAM m_stream; #elif defined(QTAUDIO) -- cgit From 35f2333403cdd930848fb998739583c6c829f5d3 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 19 Aug 2019 19:06:41 +0200 Subject: list audio devices (doesn't apply it yet) --- include/aooptionsdialog.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h index 83b84cbc..934d2577 100644 --- a/include/aooptionsdialog.h +++ b/include/aooptionsdialog.h @@ -2,7 +2,13 @@ #define AOOPTIONSDIALOG_H #include "aoapplication.h" + +#ifdef BASSAUDIO #include "bass.h" +#elif defined QTAUDIO +#include +#include +#endif #include #include -- cgit From d94d2fb405a0d3634951cc8fa4b0e22c7979c438 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 19 Aug 2019 19:38:47 +0200 Subject: read and store qt audio device --- include/aoapplication.h | 9 +++++++-- include/courtroom.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/aoapplication.h b/include/aoapplication.h index af43cf3c..5475eb7b 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -23,6 +23,9 @@ #include #include #include +#ifdef QTAUDIO +#include +#endif class NetworkManager; class Lobby; @@ -173,6 +176,9 @@ public: // Returns the audio device used for the client. QString get_audio_output_device(); + #ifdef QTAUDIO + QAudioDeviceInfo QtAudioDevice; + #endif // Returns whether the user would like to have custom shownames on by default. bool get_showname_enabled_by_default(); @@ -196,8 +202,7 @@ public: pos_size_type get_element_dimensions(QString p_identifier, QString p_file); //Returns the name of the font with p_identifier from p_file - QString get_font_name(QString p_identifier, QString p_file); - + QString get_font_name(QString p_identifier, QString p_file); //Returns the value of font_size with p_identifier from p_file int get_font_size(QString p_identifier, QString p_file); diff --git a/include/courtroom.h b/include/courtroom.h index 99a090b0..f0b69967 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -10,6 +10,7 @@ #include "aomovie.h" #include "aocharmovie.h" #include "aomusicplayer.h" +#include "aooptionsdialog.h" #include "aosfxplayer.h" #include "aoblipplayer.h" #include "aoevidencebutton.h" -- cgit From 5807410b1dae61ba9307197f7d1ae04b8e55c378 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 20 Aug 2019 18:35:42 +0200 Subject: doubleclick to join a server --- include/lobby.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/lobby.h b/include/lobby.h index 19276a7d..4293ac36 100644 --- a/include/lobby.h +++ b/include/lobby.h @@ -75,6 +75,8 @@ private: QProgressBar *ui_progress_bar; AOButton *ui_cancel; + QModelIndex last_model; + void set_size_and_pos(QWidget *p_widget, QString p_identifier); private slots: @@ -89,6 +91,7 @@ private slots: void on_connect_released(); void on_about_clicked(); void on_server_list_clicked(QModelIndex p_model); + void on_server_list_doubleclicked(QModelIndex p_model); void on_chatfield_return_pressed(); }; -- cgit