From fa8c6acfcfb02be912d5abf794a306827abfe401 Mon Sep 17 00:00:00 2001 From: Wiktor Mazur Date: Thu, 24 Oct 2019 21:35:30 +0200 Subject: [PATCH] Pretty GUI --- backend/src/meter/mod.rs | 6 +++- frontend/src/assets/about.png | Bin 0 -> 2281 bytes frontend/src/assets/close.png | Bin 0 -> 785 bytes frontend/src/assets/copy.png | Bin 0 -> 835 bytes frontend/src/assets/reset.png | Bin 0 -> 648 bytes frontend/src/main.py | 52 ++++++++++++++++++++-------------- frontend/src/styling.py | 4 +-- 7 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 frontend/src/assets/about.png create mode 100644 frontend/src/assets/close.png create mode 100644 frontend/src/assets/copy.png create mode 100644 frontend/src/assets/reset.png diff --git a/backend/src/meter/mod.rs b/backend/src/meter/mod.rs index 2e61fb1..48400be 100644 --- a/backend/src/meter/mod.rs +++ b/backend/src/meter/mod.rs @@ -29,6 +29,10 @@ impl Session { fn from(session: &Self) -> Self { let mut players = HashMap::new(); for (player_name, player) in &session.players { + let mut new_player = Player::new(player.id); + if let CombatState::InCombat = player.combat_state() { + new_player.enter_combat(); + } players.insert(player_name.clone(), Player::new(player.id)); } @@ -284,7 +288,7 @@ impl GameStats for Meter { self.zone_history = PlayerStatisticsVec::new(); let last_session = self.zone_session_mut()?; self.zone_session = Some(Session::from(&last_session)); - self.last_fight_session = Session::new(); + self.last_fight_session = Session::from(&self.last_fight_session); Some(()) } diff --git a/frontend/src/assets/about.png b/frontend/src/assets/about.png new file mode 100644 index 0000000000000000000000000000000000000000..65ef5ba671255be2b73f4cc3a914f8a9f7e08b62 GIT binary patch literal 2281 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 P00000NkvXXu0mjfV6JF) literal 0 HcmV?d00001 diff --git a/frontend/src/assets/copy.png b/frontend/src/assets/copy.png new file mode 100644 index 0000000000000000000000000000000000000000..b6b14fa42959d26c5bf80bee5908b9f5789f8ff8 GIT binary patch literal 835 zcmV-J1HAl+P)!CD~4idQY>##~fvA%KNIIZ(OFo)fJ z^PM-p`M&pk>^!hoEEY?AQKkjkCnT}7z$B0cnhnb@DtNxUn~{Y(>Zb`o;{|BBA-4ra zP3x{l!Ml|N7r)$7-wkM)<;bw)1(Hh9`{|*2ZBqO2u*kZP@4W&SK0Zy~(6aZH?ZdZyrjhKE1D=nvXagek?OyUj+&Vfn%+5?awb?;%I8V9^tnEG zK6%}9%nt#dEQ&D-gmwLjc{v)^^(*G(XlQ#6bsNUs0hPAE(M5Y5;0g1dz)aiL=lg7%^sR1_)y{Wa zf((HyFb3pussBIUbA#wpL8yksDiV%p}o?So!XCvB4 zu{}0kAVvNjjSIcdNf7fr{@y&i6p}`v)`vOc@0@z5qL98>K`EI*@ae`Xn8wRI&+- z9~_AH5(`Xx*=_>(ZK_De-dz3SS81?VV5XSq0@SqCB!__wB4TO0?l_&{P)EW;TpyhP zBZGka1qPG?%$$6bdc{W!PzpG589E?4#P!j2V62x~fX7e$+|ned1gn4F{0sXRlK=xBEqQ@OO>5dZ zKv*;74Zt~mZpyPHz1yz7B*qI%?g>1-c5CXrCD9~M6y)7LZi4Xuz$XA*!!lhEK7jb% iM5|r5)KOAW0{j8AZL%QV`ehCP0000{} | Fame per minute {} | Party members {}".format( fame_stat.fame, fame_stat.fame_per_minute, len(engine.get_party_members()))) - + def mousePressEvent(self, event): self.mouse_pos = event.pos() def mouseMoveEvent(self, event): - if self.mode.geometry().contains(event.pos()): + if self.bar.mode.geometry().contains(event.pos()): return if not self.mouse_pos: return @@ -137,4 +145,4 @@ class MainWidget(QWidget): Mode.OVERALL: engine.overall_stats } - return sessions[self.mode.currentText()]() + return sessions[self.bar.mode.currentText()]() diff --git a/frontend/src/styling.py b/frontend/src/styling.py index 5edeb60..f485392 100644 --- a/frontend/src/styling.py +++ b/frontend/src/styling.py @@ -9,12 +9,10 @@ style = """ background-color: black; color: white; } + QListView { min-height: 100px; } - QPushButton { - max-width: 60px; - } QListView::item:selected:active { background-color: black;