Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq:[1076] showeq/branches/pre_6_0_beta/src
|
From: <cn...@us...> - 2020-10-26 05:04:37
|
Revision: 1076
http://sourceforge.net/p/seq/svn/1076
Author: cn187
Date: 2020-10-26 05:04:30 +0000 (Mon, 26 Oct 2020)
Log Message:
-----------
Replace Q3Grid with QGridLayout
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/combatlog.cpp
showeq/branches/pre_6_0_beta/src/experiencelog.cpp
Modified: showeq/branches/pre_6_0_beta/src/combatlog.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/combatlog.cpp 2020-10-26 05:04:16 UTC (rev 1075)
+++ showeq/branches/pre_6_0_beta/src/combatlog.cpp 2020-10-26 05:04:30 UTC (rev 1076)
@@ -25,7 +25,6 @@
#include "util.h"
#include "diagnosticmessages.h"
-#include <Q3Grid>
#include <QTimer>
#include <Q3HBox>
#include <Q3VGroupBox>
@@ -337,30 +336,39 @@
Q3GroupBox *summaryGBox = new Q3VGroupBox("Summary", pWidget);
m_layout_offense->addWidget(summaryGBox);
- Q3Grid *summaryGrid = new Q3Grid(4, summaryGBox);
+ QWidget *summaryGrid = new QWidget(summaryGBox);
+ QGridLayout *summaryGridLayout = new QGridLayout(summaryGBox);
- new QLabel("Total Damage:", summaryGrid);
- m_label_offense_totaldamage = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Total Damage:", summaryGrid), 0, 0);
+ m_label_offense_totaldamage = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(m_label_offense_totaldamage, 0, 1);
- new QLabel("Avg Melee:", summaryGrid);
- m_label_offense_avgmelee = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Avg Melee:", summaryGrid), 0, 2);
+ m_label_offense_avgmelee = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(m_label_offense_avgmelee, 0, 3);
- new QLabel("% from Special:", summaryGrid);
- m_label_offense_percentspecial = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("% from Special:", summaryGrid), 1, 0);
+ m_label_offense_percentspecial = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(m_label_offense_percentspecial, 1, 1);
- new QLabel("Avg Special:", summaryGrid);
- m_label_offense_avgspecial = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Avg Special:", summaryGrid), 1, 2);
+ m_label_offense_avgspecial = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(m_label_offense_avgspecial, 1, 3);
- new QLabel("% from NonMelee:", summaryGrid);
- m_label_offense_percentnonmelee = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("% from NonMelee:", summaryGrid), 2, 0);
+ m_label_offense_percentnonmelee = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(m_label_offense_percentnonmelee, 2, 1);
- new QLabel("Avg NonMelee:", summaryGrid);
- m_label_offense_avgnonmelee = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Avg NonMelee:", summaryGrid), 2, 2);
+ m_label_offense_avgnonmelee = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(m_label_offense_avgnonmelee, 2, 3);
- ((QGridLayout *)summaryGrid->layout())->setColStretch(1, 1);
- ((QGridLayout *)summaryGrid->layout())->setColStretch(3, 1);
- summaryGrid->layout()->setSpacing(5);
+ summaryGridLayout->setColStretch(1, 1);
+ summaryGridLayout->setColStretch(3, 1);
+ summaryGridLayout->setSpacing(5);
+ summaryGrid->setLayout(summaryGridLayout);
+
return pWidget;
}
@@ -372,69 +380,92 @@
Q3GroupBox *avoidanceGBox = new Q3VGroupBox("Avoidance", pWidget);
m_layout_defense->addWidget(avoidanceGBox);
- Q3Grid *avoidanceGrid = new Q3Grid(6, avoidanceGBox);
+ QWidget *avoidanceGrid = new QWidget(avoidanceGBox);
+ QGridLayout * avoidanceGridLayout = new QGridLayout(avoidanceGBox);
- new QLabel("Misses:", avoidanceGrid);
- m_label_defense_avoid_misses = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(new QLabel("Misses:", avoidanceGrid), 0, 0);
+ m_label_defense_avoid_misses = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(m_label_defense_avoid_misses, 0, 1);
- new QLabel("Blocks:", avoidanceGrid);
- m_label_defense_avoid_block = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(new QLabel("Blocks:", avoidanceGrid), 0, 2);
+ m_label_defense_avoid_block = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(m_label_defense_avoid_block, 0, 3);
- new QLabel("Parries:", avoidanceGrid);
- m_label_defense_avoid_parry = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(new QLabel("Parries:", avoidanceGrid), 0, 4);
+ m_label_defense_avoid_parry = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(m_label_defense_avoid_parry, 0, 5);
- new QLabel("Ripostes:", avoidanceGrid);
- m_label_defense_avoid_riposte = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(new QLabel("Ripostes:", avoidanceGrid), 1, 0);
+ m_label_defense_avoid_riposte = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(m_label_defense_avoid_riposte, 1, 1);
- new QLabel("Dodges", avoidanceGrid);
- m_label_defense_avoid_dodge = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(new QLabel("Dodges", avoidanceGrid), 1, 2);
+ m_label_defense_avoid_dodge = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(m_label_defense_avoid_dodge, 1, 3);
- new QLabel("Total:", avoidanceGrid);
- m_label_defense_avoid_total = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(new QLabel("Total:", avoidanceGrid), 1, 4);
+ m_label_defense_avoid_total = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(m_label_defense_avoid_total, 1, 5);
- ((QGridLayout *)avoidanceGrid->layout())->setColStretch(1, 1);
- ((QGridLayout *)avoidanceGrid->layout())->setColStretch(3, 1);
- ((QGridLayout *)avoidanceGrid->layout())->setColStretch(5, 1);
- avoidanceGrid->layout()->setSpacing(5);
+ avoidanceGridLayout->setColStretch(1, 1);
+ avoidanceGridLayout->setColStretch(3, 1);
+ avoidanceGridLayout->setColStretch(5, 1);
+ avoidanceGridLayout->setSpacing(5);
+ avoidanceGrid->setLayout(avoidanceGridLayout);
+
+
Q3GroupBox *mitigationGBox = new Q3VGroupBox("Mitigation", pWidget);
m_layout_defense->addWidget(mitigationGBox);
- Q3Grid *mitigationGrid = new Q3Grid(6, mitigationGBox);
+ QWidget *mitigationGrid = new QWidget(mitigationGBox);
+ QGridLayout *mitigationGridLayout = new QGridLayout(mitigationGBox);
- new QLabel("Avg. Hit:", mitigationGrid);
- m_label_defense_mitigate_avghit = new QLabel(mitigationGrid);
+ mitigationGridLayout->addWidget(new QLabel("Avg. Hit:", mitigationGrid), 0, 0);
+ m_label_defense_mitigate_avghit = new QLabel(mitigationGrid);
+ mitigationGridLayout->addWidget(m_label_defense_mitigate_avghit, 0, 1);
- new QLabel("Min:", mitigationGrid);
- m_label_defense_mitigate_minhit = new QLabel(mitigationGrid);
+ mitigationGridLayout->addWidget(new QLabel("Min:", mitigationGrid), 0, 2);
+ m_label_defense_mitigate_minhit = new QLabel(mitigationGrid);
+ mitigationGridLayout->addWidget(m_label_defense_mitigate_minhit, 0, 3);
- new QLabel("Max:", mitigationGrid);
- m_label_defense_mitigate_maxhit = new QLabel(mitigationGrid);
+ mitigationGridLayout->addWidget(new QLabel("Max:", mitigationGrid), 0, 4);
+ m_label_defense_mitigate_maxhit = new QLabel(mitigationGrid);
+ mitigationGridLayout->addWidget(m_label_defense_mitigate_maxhit, 0, 5);
- ((QGridLayout *)mitigationGrid->layout())->setColStretch(1, 1);
- ((QGridLayout *)mitigationGrid->layout())->setColStretch(3, 1);
- ((QGridLayout *)mitigationGrid->layout())->setColStretch(5, 1);
- mitigationGrid->layout()->setSpacing(5);
+ mitigationGridLayout->setColStretch(1, 1);
+ mitigationGridLayout->setColStretch(3, 1);
+ mitigationGridLayout->setColStretch(5, 1);
+ mitigationGridLayout->setSpacing(5);
+ mitigationGrid->setLayout(mitigationGridLayout);
+
+
Q3GroupBox *summaryGBox = new Q3VGroupBox("Summary", pWidget);
m_layout_defense->addWidget(summaryGBox);
- Q3Grid *summaryGrid = new Q3Grid(6, summaryGBox);
+ QWidget *summaryGrid = new QWidget(summaryGBox);
+ QGridLayout *summaryGridLayout = new QGridLayout(summaryGBox);
- new QLabel("Mob Attacks:", summaryGrid);
- m_label_defense_summary_mobattacks = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Mob Attacks:", summaryGrid), 0, 0);
+ m_label_defense_summary_mobattacks = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(m_label_defense_summary_mobattacks, 0, 1);
- new QLabel("% Avoided:", summaryGrid);
- m_label_defense_summary_percentavoided = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("% Avoided:", summaryGrid), 0, 2);
+ m_label_defense_summary_percentavoided = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(m_label_defense_summary_percentavoided, 0, 3);
- new QLabel("Total Damage:", summaryGrid);
- m_label_defense_summary_totaldamage = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Total Damage:", summaryGrid), 0, 4);
+ m_label_defense_summary_totaldamage = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(m_label_defense_summary_totaldamage, 0, 5);
- ((QGridLayout *)summaryGrid->layout())->setColStretch(1, 1);
- ((QGridLayout *)summaryGrid->layout())->setColStretch(3, 1);
- ((QGridLayout *)summaryGrid->layout())->setColStretch(5, 1);
- summaryGrid->layout()->setSpacing(5);
+ summaryGridLayout->setColStretch(1, 1);
+ summaryGridLayout->setColStretch(3, 1);
+ summaryGridLayout->setColStretch(5, 1);
+ summaryGridLayout->setSpacing(5);
+ summaryGrid->setLayout(summaryGridLayout);
+
return pWidget;
}
@@ -472,25 +503,32 @@
Q3GroupBox *summaryGBox = new Q3VGroupBox("Summary", pWidget);
m_layout_mob->addWidget(summaryGBox);
- Q3Grid *summaryGrid = new Q3Grid(4, summaryGBox);
+ QWidget *summaryGrid = new QWidget(summaryGBox);
+ QGridLayout *summaryGridLayout = new QGridLayout(summaryGBox);
- new QLabel("Total Mobs", summaryGrid);
- m_label_mob_totalmobs = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Total Mobs", summaryGrid), 0, 0);
+ m_label_mob_totalmobs = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(m_label_mob_totalmobs, 0, 1);
- new QLabel("Avg DPS:", summaryGrid);
- m_label_mob_avgdps = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Avg DPS:", summaryGrid), 0, 2);
+ m_label_mob_avgdps = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(m_label_mob_avgdps, 0, 3);
- new QLabel("Current DPS:", summaryGrid);
- m_label_mob_currentdps = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Current DPS:", summaryGrid), 1, 0);
+ m_label_mob_currentdps = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(m_label_mob_currentdps, 1, 1);
- new QLabel("Last DPS:", summaryGrid);
- m_label_mob_lastdps = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Last DPS:", summaryGrid), 1, 2);
+ m_label_mob_lastdps = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(m_label_mob_lastdps, 1, 3);
- ((QGridLayout *)summaryGrid->layout())->setColStretch(1, 1);
- ((QGridLayout *)summaryGrid->layout())->setColStretch(3, 1);
- summaryGrid->layout()->setSpacing(5);
+ summaryGridLayout->setColStretch(1, 1);
+ summaryGridLayout->setColStretch(3, 1);
+ summaryGridLayout->setSpacing(5);
+ summaryGrid->setLayout(summaryGridLayout);
+
return pWidget;
}
Modified: showeq/branches/pre_6_0_beta/src/experiencelog.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/experiencelog.cpp 2020-10-26 05:04:16 UTC (rev 1075)
+++ showeq/branches/pre_6_0_beta/src/experiencelog.cpp 2020-10-26 05:04:30 UTC (rev 1076)
@@ -33,7 +33,6 @@
#include <cstdio>
#include <ctime>
-#include <Q3Grid>
#include <QTimer>
#include <Q3HBox>
#include <Q3VGroupBox>
@@ -231,43 +230,49 @@
Q3GroupBox *statsGBox = new Q3VGroupBox( "Statistics", this );
m_layout->addWidget( statsGBox );
-
- Q3Grid *statsGrid = new Q3Grid( 4, statsGBox );
- new QLabel( "Total Experience Received:",
- statsGrid );
- m_total_received = new QLabel( statsGrid );
+ QWidget *statsGrid = new QWidget(statsGBox);
+ QGridLayout *statsGridLayout = new QGridLayout(statsGBox);
- new QLabel( "Play Time:", statsGrid );
- m_play_time = new QLabel( statsGrid );
+ statsGridLayout->addWidget(new QLabel("Total Experience Received:", statsGrid), 0, 0);
+ m_total_received = new QLabel(statsGrid);
+ statsGridLayout->addWidget(m_total_received, 0, 1);
- new QLabel( "Total Mobs Killed:", statsGrid );
- m_mob_count = new QLabel( statsGrid );
+ statsGridLayout->addWidget(new QLabel("Play Time:", statsGrid), 0, 2);
+ m_play_time = new QLabel(statsGrid);
+ statsGridLayout->addWidget(m_play_time, 0, 3);
+ statsGridLayout->addWidget(new QLabel("Total Mobs Killed:", statsGrid), 1, 0);
+ m_mob_count = new QLabel(statsGrid);
+ statsGridLayout->addWidget(m_mob_count, 1, 1);
+
m_experience_rate_label = new QLabel( "Experience Rate (per minute):", statsGrid );
- m_experience_rate = new QLabel( statsGrid );
+ statsGridLayout->addWidget(m_experience_rate_label, 1, 2);
+ m_experience_rate = new QLabel(statsGrid);
+ statsGridLayout->addWidget(m_experience_rate, 1, 3);
- new QLabel( "Average Experience per Mob:",
- statsGrid );
- m_average_per_mob = new QLabel( statsGrid );
+ statsGridLayout->addWidget(new QLabel("Average Experience per Mob:", statsGrid), 2, 0);
+ m_average_per_mob = new QLabel(statsGrid);
+ statsGridLayout->addWidget(m_average_per_mob, 2, 1);
- new QLabel( "Estimated Kills To Level:",
- statsGrid );
- m_kills_to_level = new QLabel( statsGrid );
+ statsGridLayout->addWidget(new QLabel( "Estimated Kills To Level:", statsGrid), 2, 2);
+ m_kills_to_level = new QLabel(statsGrid);
+ statsGridLayout->addWidget(m_kills_to_level, 2, 3);
- new QLabel( "Experience Remaining:",
- statsGrid );
- m_experience_remaining = new QLabel( statsGrid );
+ statsGridLayout->addWidget(new QLabel( "Experience Remaining:", statsGrid), 3, 0);
+ m_experience_remaining = new QLabel(statsGrid);
+ statsGridLayout->addWidget(m_experience_remaining, 3, 1);
- new QLabel( "Estimated Time To Level:",
- statsGrid );
- m_time_to_level = new QLabel( statsGrid );
+ statsGridLayout->addWidget(new QLabel( "Estimated Time To Level:", statsGrid ), 3, 2);
+ m_time_to_level = new QLabel(statsGrid);
+ statsGridLayout->addWidget(m_time_to_level, 3, 3);
- // ewww, why can't we just get it from QGrid? :(
- ((QGridLayout *)statsGrid->layout())->setColStretch( 1, 1 );
- ((QGridLayout *)statsGrid->layout())->setColStretch( 3, 1 );
- statsGrid->layout()->setSpacing( 5 );
+ statsGridLayout->setColStretch( 1, 1 );
+ statsGridLayout->setColStretch( 3, 1 );
+ statsGridLayout->setSpacing( 5 );
+ statsGrid->setLayout(statsGridLayout);
+
updateAverage( );
// timer to update the average xp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
