Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq:[1077] showeq/branches/pre_6_0_beta/src
|
From: <cn...@us...> - 2020-10-27 04:15:45
|
Revision: 1077
http://sourceforge.net/p/seq/svn/1077
Author: cn187
Date: 2020-10-27 04:15:38 +0000 (Tue, 27 Oct 2020)
Log Message:
-----------
Replace Q3GroupBox/Q3VGroupBox with QGroupBox + QVBoxLayout
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/combatlog.cpp
showeq/branches/pre_6_0_beta/src/experiencelog.cpp
showeq/branches/pre_6_0_beta/src/messagefilterdialog.cpp
showeq/branches/pre_6_0_beta/src/messagefilterdialog.h
showeq/branches/pre_6_0_beta/src/messagewindow.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:30 UTC (rev 1076)
+++ showeq/branches/pre_6_0_beta/src/combatlog.cpp 2020-10-27 04:15:38 UTC (rev 1077)
@@ -27,7 +27,7 @@
#include <QTimer>
#include <Q3HBox>
-#include <Q3VGroupBox>
+#include <QGroupBox>
#include <QMessageBox>
#include <QLayout>
#include <QLabel>
@@ -306,10 +306,10 @@
{
QWidget *pWidget = new QWidget(m_tab);
- m_layout_offense = new QVBoxLayout(pWidget);
+ m_layout_offense = new QVBoxLayout(pWidget);
- Q3GroupBox *listGBox = new Q3VGroupBox(pWidget);
- m_layout_offense->addWidget(listGBox);
+ QGroupBox *listGBox = new QGroupBox(pWidget);
+ m_layout_offense->addWidget(listGBox);
m_listview_offense = new SEQListView(preferenceName(), listGBox);
m_listview_offense->addColumn("Type");
@@ -333,34 +333,41 @@
m_listview_offense->setMinimumSize(m_listview_offense->sizeHint().width(), 200);
- Q3GroupBox *summaryGBox = new Q3VGroupBox("Summary", pWidget);
+ QHBoxLayout * listGBoxLayout = new QHBoxLayout(listGBox);
+ listGBoxLayout->addWidget(m_listview_offense);
+
+ QGroupBox *summaryGBox = new QGroupBox("Summary", pWidget);
+ QHBoxLayout *summaryGBoxLayout = new QHBoxLayout(summaryGBox);
+
m_layout_offense->addWidget(summaryGBox);
- QWidget *summaryGrid = new QWidget(summaryGBox);
- QGridLayout *summaryGridLayout = new QGridLayout(summaryGBox);
- summaryGridLayout->addWidget(new QLabel("Total Damage:", summaryGrid), 0, 0);
- m_label_offense_totaldamage = new QLabel(summaryGrid);
+ QGridLayout *summaryGridLayout = new QGridLayout();
+
+ summaryGBoxLayout->addLayout(summaryGridLayout);
+
+ summaryGridLayout->addWidget(new QLabel("Total Damage:", summaryGBox), 0, 0);
+ m_label_offense_totaldamage = new QLabel(summaryGBox);
summaryGridLayout->addWidget(m_label_offense_totaldamage, 0, 1);
- summaryGridLayout->addWidget(new QLabel("Avg Melee:", summaryGrid), 0, 2);
- m_label_offense_avgmelee = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Avg Melee:", summaryGBox), 0, 2);
+ m_label_offense_avgmelee = new QLabel(summaryGBox);
summaryGridLayout->addWidget(m_label_offense_avgmelee, 0, 3);
- summaryGridLayout->addWidget(new QLabel("% from Special:", summaryGrid), 1, 0);
- m_label_offense_percentspecial = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("% from Special:", summaryGBox), 1, 0);
+ m_label_offense_percentspecial = new QLabel(summaryGBox);
summaryGridLayout->addWidget(m_label_offense_percentspecial, 1, 1);
- summaryGridLayout->addWidget(new QLabel("Avg Special:", summaryGrid), 1, 2);
- m_label_offense_avgspecial = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Avg Special:", summaryGBox), 1, 2);
+ m_label_offense_avgspecial = new QLabel(summaryGBox);
summaryGridLayout->addWidget(m_label_offense_avgspecial, 1, 3);
- summaryGridLayout->addWidget(new QLabel("% from NonMelee:", summaryGrid), 2, 0);
- m_label_offense_percentnonmelee = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("% from NonMelee:", summaryGBox), 2, 0);
+ m_label_offense_percentnonmelee = new QLabel(summaryGBox);
summaryGridLayout->addWidget(m_label_offense_percentnonmelee, 2, 1);
- summaryGridLayout->addWidget(new QLabel("Avg NonMelee:", summaryGrid), 2, 2);
- m_label_offense_avgnonmelee = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Avg NonMelee:", summaryGBox), 2, 2);
+ m_label_offense_avgnonmelee = new QLabel(summaryGBox);
summaryGridLayout->addWidget(m_label_offense_avgnonmelee, 2, 3);
summaryGridLayout->setColStretch(1, 1);
@@ -367,8 +374,6 @@
summaryGridLayout->setColStretch(3, 1);
summaryGridLayout->setSpacing(5);
- summaryGrid->setLayout(summaryGridLayout);
-
return pWidget;
}
@@ -377,95 +382,108 @@
QWidget *pWidget = new QWidget(m_tab);
m_layout_defense = new QVBoxLayout(pWidget);
- Q3GroupBox *avoidanceGBox = new Q3VGroupBox("Avoidance", pWidget);
- m_layout_defense->addWidget(avoidanceGBox);
+ QGroupBox *avoidanceGBox = new QGroupBox("Avoidance", pWidget);
+ QHBoxLayout *avoidanceGBoxLayout = new QHBoxLayout(avoidanceGBox);
- QWidget *avoidanceGrid = new QWidget(avoidanceGBox);
- QGridLayout * avoidanceGridLayout = new QGridLayout(avoidanceGBox);
+ m_layout_defense->addWidget(avoidanceGBox);
- avoidanceGridLayout->addWidget(new QLabel("Misses:", avoidanceGrid), 0, 0);
- m_label_defense_avoid_misses = new QLabel(avoidanceGrid);
+ QGridLayout * avoidanceGridLayout = new QGridLayout();
+
+ avoidanceGBoxLayout->addLayout(avoidanceGridLayout);
+
+ avoidanceGridLayout->addWidget(new QLabel("Misses:", avoidanceGBox), 0, 0);
+ m_label_defense_avoid_misses = new QLabel(avoidanceGBox);
avoidanceGridLayout->addWidget(m_label_defense_avoid_misses, 0, 1);
- avoidanceGridLayout->addWidget(new QLabel("Blocks:", avoidanceGrid), 0, 2);
- m_label_defense_avoid_block = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(new QLabel("Blocks:", avoidanceGBox), 0, 2);
+ m_label_defense_avoid_block = new QLabel(avoidanceGBox);
avoidanceGridLayout->addWidget(m_label_defense_avoid_block, 0, 3);
- avoidanceGridLayout->addWidget(new QLabel("Parries:", avoidanceGrid), 0, 4);
- m_label_defense_avoid_parry = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(new QLabel("Parries:", avoidanceGBox), 0, 4);
+ m_label_defense_avoid_parry = new QLabel(avoidanceGBox);
avoidanceGridLayout->addWidget(m_label_defense_avoid_parry, 0, 5);
- avoidanceGridLayout->addWidget(new QLabel("Ripostes:", avoidanceGrid), 1, 0);
- m_label_defense_avoid_riposte = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(new QLabel("Ripostes:", avoidanceGBox), 1, 0);
+ m_label_defense_avoid_riposte = new QLabel(avoidanceGBox);
avoidanceGridLayout->addWidget(m_label_defense_avoid_riposte, 1, 1);
- avoidanceGridLayout->addWidget(new QLabel("Dodges", avoidanceGrid), 1, 2);
- m_label_defense_avoid_dodge = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(new QLabel("Dodges", avoidanceGBox), 1, 2);
+ m_label_defense_avoid_dodge = new QLabel(avoidanceGBox);
avoidanceGridLayout->addWidget(m_label_defense_avoid_dodge, 1, 3);
- avoidanceGridLayout->addWidget(new QLabel("Total:", avoidanceGrid), 1, 4);
- m_label_defense_avoid_total = new QLabel(avoidanceGrid);
+ avoidanceGridLayout->addWidget(new QLabel("Total:", avoidanceGBox), 1, 4);
+ m_label_defense_avoid_total = new QLabel(avoidanceGBox);
avoidanceGridLayout->addWidget(m_label_defense_avoid_total, 1, 5);
+ avoidanceGridLayout->addItem(new QSpacerItem(1,1), 2, 0, 1, 6);
+
avoidanceGridLayout->setColStretch(1, 1);
avoidanceGridLayout->setColStretch(3, 1);
avoidanceGridLayout->setColStretch(5, 1);
+ avoidanceGridLayout->setRowStretch(2, 1);
avoidanceGridLayout->setSpacing(5);
- avoidanceGrid->setLayout(avoidanceGridLayout);
+ QGroupBox *mitigationGBox = new QGroupBox("Mitigation", pWidget);
+ QHBoxLayout *mitigationGBoxLayout = new QHBoxLayout(mitigationGBox);
- Q3GroupBox *mitigationGBox = new Q3VGroupBox("Mitigation", pWidget);
- m_layout_defense->addWidget(mitigationGBox);
+ m_layout_defense->addWidget(mitigationGBox);
- QWidget *mitigationGrid = new QWidget(mitigationGBox);
- QGridLayout *mitigationGridLayout = new QGridLayout(mitigationGBox);
+ QGridLayout *mitigationGridLayout = new QGridLayout();
- mitigationGridLayout->addWidget(new QLabel("Avg. Hit:", mitigationGrid), 0, 0);
- m_label_defense_mitigate_avghit = new QLabel(mitigationGrid);
+ mitigationGBoxLayout->addLayout(mitigationGridLayout);
+
+ mitigationGridLayout->addWidget(new QLabel("Avg. Hit:", mitigationGBox), 0, 0);
+ m_label_defense_mitigate_avghit = new QLabel(mitigationGBox);
mitigationGridLayout->addWidget(m_label_defense_mitigate_avghit, 0, 1);
- mitigationGridLayout->addWidget(new QLabel("Min:", mitigationGrid), 0, 2);
- m_label_defense_mitigate_minhit = new QLabel(mitigationGrid);
+ mitigationGridLayout->addWidget(new QLabel("Min:", mitigationGBox), 0, 2);
+ m_label_defense_mitigate_minhit = new QLabel(mitigationGBox);
mitigationGridLayout->addWidget(m_label_defense_mitigate_minhit, 0, 3);
- mitigationGridLayout->addWidget(new QLabel("Max:", mitigationGrid), 0, 4);
- m_label_defense_mitigate_maxhit = new QLabel(mitigationGrid);
+ mitigationGridLayout->addWidget(new QLabel("Max:", mitigationGBox), 0, 4);
+ m_label_defense_mitigate_maxhit = new QLabel(mitigationGBox);
mitigationGridLayout->addWidget(m_label_defense_mitigate_maxhit, 0, 5);
+ mitigationGridLayout->addItem(new QSpacerItem(1,1), 1, 0, 1, 6);
+
mitigationGridLayout->setColStretch(1, 1);
mitigationGridLayout->setColStretch(3, 1);
mitigationGridLayout->setColStretch(5, 1);
+ mitigationGridLayout->setRowStretch(1, 1);
mitigationGridLayout->setSpacing(5);
- mitigationGrid->setLayout(mitigationGridLayout);
- Q3GroupBox *summaryGBox = new Q3VGroupBox("Summary", pWidget);
- m_layout_defense->addWidget(summaryGBox);
+ QGroupBox *summaryGBox = new QGroupBox("Summary", pWidget);
+ QHBoxLayout *summaryGBoxLayout = new QHBoxLayout(summaryGBox);
- QWidget *summaryGrid = new QWidget(summaryGBox);
- QGridLayout *summaryGridLayout = new QGridLayout(summaryGBox);
+ m_layout_defense->addWidget(summaryGBox);
- summaryGridLayout->addWidget(new QLabel("Mob Attacks:", summaryGrid), 0, 0);
- m_label_defense_summary_mobattacks = new QLabel(summaryGrid);
+ QGridLayout *summaryGridLayout = new QGridLayout();
+
+ summaryGBoxLayout->addLayout(summaryGridLayout);
+
+ summaryGridLayout->addWidget(new QLabel("Mob Attacks:", summaryGBox), 0, 0);
+ m_label_defense_summary_mobattacks = new QLabel(summaryGBox);
summaryGridLayout->addWidget(m_label_defense_summary_mobattacks, 0, 1);
- summaryGridLayout->addWidget(new QLabel("% Avoided:", summaryGrid), 0, 2);
- m_label_defense_summary_percentavoided = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("% Avoided:", summaryGBox), 0, 2);
+ m_label_defense_summary_percentavoided = new QLabel(summaryGBox);
summaryGridLayout->addWidget(m_label_defense_summary_percentavoided, 0, 3);
- summaryGridLayout->addWidget(new QLabel("Total Damage:", summaryGrid), 0, 4);
- m_label_defense_summary_totaldamage = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Total Damage:", summaryGBox), 0, 4);
+ m_label_defense_summary_totaldamage = new QLabel(summaryGBox);
summaryGridLayout->addWidget(m_label_defense_summary_totaldamage, 0, 5);
+ summaryGridLayout->addItem(new QSpacerItem(1,1), 2, 0, 1, 6);
+
summaryGridLayout->setColStretch(1, 1);
summaryGridLayout->setColStretch(3, 1);
summaryGridLayout->setColStretch(5, 1);
+ summaryGridLayout->setRowStretch(1, 1);
summaryGridLayout->setSpacing(5);
- summaryGrid->setLayout(summaryGridLayout);
-
return pWidget;
}
@@ -475,7 +493,7 @@
m_layout_mob = new QVBoxLayout(pWidget);
- Q3GroupBox *listGBox = new Q3VGroupBox(pWidget);
+ QGroupBox *listGBox = new QGroupBox(pWidget);
m_layout_mob->addWidget(listGBox);
m_listview_mob = new SEQListView(preferenceName(), listGBox);
@@ -500,26 +518,32 @@
m_listview_mob->setMinimumSize(m_listview_mob->sizeHint().width(), 200);
- Q3GroupBox *summaryGBox = new Q3VGroupBox("Summary", pWidget);
+ QHBoxLayout *listGBoxLayout = new QHBoxLayout(listGBox);
+ listGBoxLayout->addWidget(m_listview_mob);
+
+ QGroupBox *summaryGBox = new QGroupBox("Summary", pWidget);
+ QHBoxLayout *summaryGBoxLayout = new QHBoxLayout(summaryGBox);
+
m_layout_mob->addWidget(summaryGBox);
- QWidget *summaryGrid = new QWidget(summaryGBox);
- QGridLayout *summaryGridLayout = new QGridLayout(summaryGBox);
+ QGridLayout *summaryGridLayout = new QGridLayout();
- summaryGridLayout->addWidget(new QLabel("Total Mobs", summaryGrid), 0, 0);
- m_label_mob_totalmobs = new QLabel(summaryGrid);
+ summaryGBoxLayout->addLayout(summaryGridLayout);
+
+ summaryGridLayout->addWidget(new QLabel("Total Mobs", summaryGBox), 0, 0);
+ m_label_mob_totalmobs = new QLabel(summaryGBox);
summaryGridLayout->addWidget(m_label_mob_totalmobs, 0, 1);
- summaryGridLayout->addWidget(new QLabel("Avg DPS:", summaryGrid), 0, 2);
- m_label_mob_avgdps = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Avg DPS:", summaryGBox), 0, 2);
+ m_label_mob_avgdps = new QLabel(summaryGBox);
summaryGridLayout->addWidget(m_label_mob_avgdps, 0, 3);
- summaryGridLayout->addWidget(new QLabel("Current DPS:", summaryGrid), 1, 0);
- m_label_mob_currentdps = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Current DPS:", summaryGBox), 1, 0);
+ m_label_mob_currentdps = new QLabel(summaryGBox);
summaryGridLayout->addWidget(m_label_mob_currentdps, 1, 1);
- summaryGridLayout->addWidget(new QLabel("Last DPS:", summaryGrid), 1, 2);
- m_label_mob_lastdps = new QLabel(summaryGrid);
+ summaryGridLayout->addWidget(new QLabel("Last DPS:", summaryGBox), 1, 2);
+ m_label_mob_lastdps = new QLabel(summaryGBox);
summaryGridLayout->addWidget(m_label_mob_lastdps, 1, 3);
summaryGridLayout->setColStretch(1, 1);
@@ -526,9 +550,7 @@
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:30 UTC (rev 1076)
+++ showeq/branches/pre_6_0_beta/src/experiencelog.cpp 2020-10-27 04:15:38 UTC (rev 1077)
@@ -35,7 +35,7 @@
#include <QTimer>
#include <Q3HBox>
-#include <Q3VGroupBox>
+#include <QGroupBox>
#include <QMessageBox>
#include <QFileInfo>
#include <QResizeEvent>
@@ -210,7 +210,7 @@
//m_layout->addSpacing( m_menu_bar->height() + 5 );
m_layout->addWidget(m_menu_bar);
- Q3GroupBox *listGBox = new Q3VGroupBox( "Experience Log", this );
+ QGroupBox *listGBox = new QGroupBox( "Experience Log", this );
m_layout->addWidget( listGBox );
m_exp_listview = new SEQListView(preferenceName(), listGBox);
@@ -228,43 +228,49 @@
m_exp_listview->setMinimumSize( m_exp_listview->sizeHint().width(),
200 );
- Q3GroupBox *statsGBox = new Q3VGroupBox( "Statistics", this );
+ QHBoxLayout * listGBoxLayout = new QHBoxLayout(listGBox);
+ listGBoxLayout->addWidget(m_exp_listview);
+
+ QGroupBox *statsGBox = new QGroupBox( "Statistics", this );
+ QHBoxLayout *statsGBoxLayout = new QHBoxLayout(statsGBox);
+
m_layout->addWidget( statsGBox );
- QWidget *statsGrid = new QWidget(statsGBox);
- QGridLayout *statsGridLayout = new QGridLayout(statsGBox);
+ QGridLayout *statsGridLayout = new QGridLayout();
- statsGridLayout->addWidget(new QLabel("Total Experience Received:", statsGrid), 0, 0);
- m_total_received = new QLabel(statsGrid);
+ statsGBoxLayout->addLayout(statsGridLayout);
+
+ statsGridLayout->addWidget(new QLabel("Total Experience Received:", statsGBox), 0, 0);
+ m_total_received = new QLabel(statsGBox);
statsGridLayout->addWidget(m_total_received, 0, 1);
- statsGridLayout->addWidget(new QLabel("Play Time:", statsGrid), 0, 2);
- m_play_time = new QLabel(statsGrid);
+ statsGridLayout->addWidget(new QLabel("Play Time:", statsGBox), 0, 2);
+ m_play_time = new QLabel(statsGBox);
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(new QLabel("Total Mobs Killed:", statsGBox), 1, 0);
+ m_mob_count = new QLabel(statsGBox);
statsGridLayout->addWidget(m_mob_count, 1, 1);
- m_experience_rate_label = new QLabel( "Experience Rate (per minute):", statsGrid );
+ m_experience_rate_label = new QLabel( "Experience Rate (per minute):", statsGBox );
statsGridLayout->addWidget(m_experience_rate_label, 1, 2);
- m_experience_rate = new QLabel(statsGrid);
+ m_experience_rate = new QLabel(statsGBox);
statsGridLayout->addWidget(m_experience_rate, 1, 3);
- statsGridLayout->addWidget(new QLabel("Average Experience per Mob:", statsGrid), 2, 0);
- m_average_per_mob = new QLabel(statsGrid);
+ statsGridLayout->addWidget(new QLabel("Average Experience per Mob:", statsGBox), 2, 0);
+ m_average_per_mob = new QLabel(statsGBox);
statsGridLayout->addWidget(m_average_per_mob, 2, 1);
- statsGridLayout->addWidget(new QLabel( "Estimated Kills To Level:", statsGrid), 2, 2);
- m_kills_to_level = new QLabel(statsGrid);
+ statsGridLayout->addWidget(new QLabel( "Estimated Kills To Level:", statsGBox), 2, 2);
+ m_kills_to_level = new QLabel(statsGBox);
statsGridLayout->addWidget(m_kills_to_level, 2, 3);
- statsGridLayout->addWidget(new QLabel( "Experience Remaining:", statsGrid), 3, 0);
- m_experience_remaining = new QLabel(statsGrid);
+ statsGridLayout->addWidget(new QLabel( "Experience Remaining:", statsGBox), 3, 0);
+ m_experience_remaining = new QLabel(statsGBox);
statsGridLayout->addWidget(m_experience_remaining, 3, 1);
- statsGridLayout->addWidget(new QLabel( "Estimated Time To Level:", statsGrid ), 3, 2);
- m_time_to_level = new QLabel(statsGrid);
+ statsGridLayout->addWidget(new QLabel( "Estimated Time To Level:", statsGBox ), 3, 2);
+ m_time_to_level = new QLabel(statsGBox);
statsGridLayout->addWidget(m_time_to_level, 3, 3);
statsGridLayout->setColStretch( 1, 1 );
@@ -271,8 +277,6 @@
statsGridLayout->setColStretch( 3, 1 );
statsGridLayout->setSpacing( 5 );
- statsGrid->setLayout(statsGridLayout);
-
updateAverage( );
// timer to update the average xp
Modified: showeq/branches/pre_6_0_beta/src/messagefilterdialog.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/messagefilterdialog.cpp 2020-10-26 05:04:30 UTC (rev 1076)
+++ showeq/branches/pre_6_0_beta/src/messagefilterdialog.cpp 2020-10-27 04:15:38 UTC (rev 1077)
@@ -30,7 +30,7 @@
#include <QString>
#include <QRegExp>
#include <QLayout>
-#include <Q3GroupBox>
+#include <QGroupBox>
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
@@ -37,8 +37,8 @@
#include <Q3ListBox>
#include <QHBoxLayout>
#include <QGridLayout>
-#include <Q3Frame>
#include <QVBoxLayout>
+#include <QFormLayout>
//----------------------------------------------------------------------
// MessageFilterListBoxText
@@ -106,9 +106,9 @@
this, SLOT(addedFilter(uint32_t, uint8_t, const MessageFilter&)));
// setup the dialog
- QVBoxLayout* outerLayout = new QVBoxLayout(this, 5, -1, "outerlayout");
- QHBoxLayout* columnLayout = new QHBoxLayout(outerLayout, -1, "columns");
- QVBoxLayout* column1Layout = new QVBoxLayout(5, "column1");
+ QVBoxLayout* outerLayout = new QVBoxLayout(this);
+ QHBoxLayout* columnLayout = new QHBoxLayout(outerLayout);
+ QVBoxLayout* column1Layout = new QVBoxLayout();
columnLayout->addLayout(column1Layout, 1);
// layout 1st column
@@ -127,57 +127,60 @@
connect(m_new, SIGNAL(clicked()),
this, SLOT(newFilter()));
- m_filterGroup = new Q3GroupBox(1, Qt::Vertical,
- "New &Filter", this, "filtergroup");
+ m_filterGroup = new QGroupBox("New &Filter", this);
columnLayout->addWidget(m_filterGroup, 5);
- Q3Frame* dummy = new Q3Frame(m_filterGroup, "dummy");
+ QVBoxLayout *filterGBoxLayout = new QVBoxLayout(m_filterGroup);
+ QHBoxLayout *filterButtonLayout = new QHBoxLayout();
+ QFormLayout* newFilterLayout = new QFormLayout();
- QGridLayout* filterLayout = new QGridLayout(dummy, 8, 3, 5, -1, "filterlayout");
-
- label = new QLabel("&Name", dummy);
- filterLayout->addWidget(label, 0, 0, Qt::AlignLeft | Qt::AlignVCenter);
- m_name = new QLineEdit(dummy, "name");
- filterLayout->addMultiCellWidget(m_name, 0, 0, 1, 2);
- label->setBuddy(m_name);
+ m_name = new QLineEdit(m_filterGroup, "name");
+ newFilterLayout->addRow("&Name", m_name);
connect(m_name, SIGNAL(textChanged(const QString&)),
this, SLOT(anyTextChanged(const QString&)));
- label = new QLabel("&Pattern", dummy);
- filterLayout->addWidget(label, 1, 0, Qt::AlignLeft | Qt::AlignVCenter);
- m_pattern = new QLineEdit(dummy, "pattern");
- filterLayout->addMultiCellWidget(m_pattern, 1, 1, 1, 2);
- label->setBuddy(m_pattern);
+ m_pattern = new QLineEdit(m_filterGroup, "pattern");
+ newFilterLayout->addRow("&Pattern", m_pattern);
connect(m_pattern, SIGNAL(textChanged(const QString&)),
this, SLOT(anyTextChanged(const QString&)));
- label = new QLabel("&Message Types", dummy);
- filterLayout->addWidget(label, 2, 0, Qt::AlignLeft | Qt::AlignVCenter);
- m_messageTypes = new Q3ListBox(dummy, "messagetypes");
- filterLayout->addMultiCellWidget(m_messageTypes, 2, 6, 1, 2);
- label->setBuddy(m_messageTypes);
+ m_messageTypes = new Q3ListBox(m_filterGroup, "messagetypes");
+ newFilterLayout->addRow("&Message Types", m_messageTypes);
m_messageTypes->setSelectionMode(Q3ListBox::Multi);
connect(m_messageTypes, SIGNAL(selectionChanged()),
this, SLOT(messageTypeSelectionChanged()));
- m_delete = new QPushButton("&Delete", dummy);
- filterLayout->addWidget(m_delete, 7, 0, Qt::AlignCenter);
+ m_delete = new QPushButton("&Delete", m_filterGroup);
+ m_delete->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ filterButtonLayout->addWidget(m_delete);
m_delete->setEnabled(false);
connect(m_delete, SIGNAL(clicked()),
this, SLOT(deleteFilter()));
- m_update = new QPushButton("&Update", dummy);
- filterLayout->addWidget(m_update, 7, 1, Qt::AlignCenter);
+ m_update = new QPushButton("&Update", m_filterGroup);
+ m_update->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ filterButtonLayout->addWidget(m_update);
m_update->setEnabled(false);
connect(m_update, SIGNAL(clicked()),
this, SLOT(updateFilter()));
- m_add = new QPushButton("&Add", dummy);
- filterLayout->addWidget(m_add, 7, 2, Qt::AlignCenter);
+ m_add = new QPushButton("&Add", m_filterGroup);
+ m_add->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ filterButtonLayout->addWidget(m_add);
m_add->setEnabled(false);
connect(m_add, SIGNAL(clicked()),
this, SLOT(addFilter()));
+ filterButtonLayout->setAlignment(Qt::AlignCenter);
+ filterButtonLayout->insertStretch(0, 1);
+ filterButtonLayout->insertStretch(2, 1);
+ filterButtonLayout->insertStretch(4, 1);
+ filterButtonLayout->insertStretch(6, 1);
+
+ newFilterLayout->addRow(filterButtonLayout);
+
+ filterGBoxLayout->addLayout(newFilterLayout, 2);
+
QPushButton* close = new QPushButton("&Close", this);
outerLayout->addWidget(close, 1, Qt::AlignCenter);
connect(close, SIGNAL(clicked()),
Modified: showeq/branches/pre_6_0_beta/src/messagefilterdialog.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/messagefilterdialog.h 2020-10-26 05:04:30 UTC (rev 1076)
+++ showeq/branches/pre_6_0_beta/src/messagefilterdialog.h 2020-10-27 04:15:38 UTC (rev 1077)
@@ -39,7 +39,7 @@
class QPushButton;
class Q3ListBox;
class Q3ListBoxItem;
-class Q3GroupBox;
+class QGroupBox;
//----------------------------------------------------------------------
// MessageFilterDialog
@@ -71,7 +71,7 @@
MessageFilters* m_filters;
Q3ListBox* m_existingFilters;
QPushButton* m_new;
- Q3GroupBox* m_filterGroup;
+ QGroupBox* m_filterGroup;
QLineEdit* m_name;
QLineEdit* m_pattern;
Q3ListBox* m_messageTypes;
Modified: showeq/branches/pre_6_0_beta/src/messagewindow.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/messagewindow.cpp 2020-10-26 05:04:30 UTC (rev 1076)
+++ showeq/branches/pre_6_0_beta/src/messagewindow.cpp 2020-10-27 04:15:38 UTC (rev 1077)
@@ -36,7 +36,7 @@
#include <QCheckBox>
#include <QLabel>
#include <QLineEdit>
-#include <Q3GroupBox>
+#include <QGroupBox>
#include <QFileDialog>
#include <QFile>
#include <Q3TextStream>
@@ -43,6 +43,7 @@
#include <QHBoxLayout>
#include <QKeyEvent>
#include <QGridLayout>
+#include <QFormLayout>
#include <Q3Frame>
#include <QMouseEvent>
#include <QEvent>
@@ -250,9 +251,9 @@
m_defaultBGColor(bgColor)
{
setCaption(caption);
-
+
// setup the GUI
- QGridLayout* grid = new QGridLayout(this, 6, 2);
+ QFormLayout* grid = new QFormLayout(this);
// sets margin around the grid
grid->setMargin(10);
@@ -265,10 +266,7 @@
connect(m_color, SIGNAL(clicked()),
this, SLOT(selectColor()));
- grid->addWidget(m_color, 0, 1);
- QLabel* label = new QLabel("&Color", this);
- label->setBuddy(m_color);
- grid->addWidget(label, 0, 0);
+ grid->addRow("&Color", m_color);
m_bgColor = new QPushButton("...", this, "backgroundcolor");
if (m_style.bgColor().isValid())
@@ -278,10 +276,7 @@
connect(m_bgColor, SIGNAL(clicked()),
this, SLOT(selectBGColor()));
- grid->addWidget(m_bgColor, 1,1);
- label = new QLabel("&Background Color", this);
- label->setBuddy(m_bgColor);
- grid->addWidget(label, 1, 0);
+ grid->addRow("&Background Color", m_bgColor);
m_useDefaultFont = new QCheckBox("Use &Default Font",
this, "usedefaultfont");
@@ -288,19 +283,17 @@
m_useDefaultFont->setChecked(m_style.useDefaultFont());
connect(m_useDefaultFont, SIGNAL(toggled(bool)),
this, SLOT(useDefaultFontToggled(bool)));
- grid->addWidget(m_useDefaultFont, 2, 0);
-
+
m_font = new QPushButton("&Font", this, "font");
m_font->setEnabled(!m_style.useDefaultFont());
- grid->addWidget(m_font, 2, 1);
connect(m_font, SIGNAL(clicked()),
this, SLOT(selectFont()));
- grid->addRowSpacing(3, 10);
+ grid->addRow(m_useDefaultFont, m_font);
- Q3GroupBox* exampleBox = new Q3GroupBox(1, Qt::Horizontal, "Example",
- this, "examplebox");
- grid->addMultiCellWidget(exampleBox, 4, 4, 0, 2);
+ QGroupBox* exampleBox = new QGroupBox("Example", this);
+ exampleBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ QVBoxLayout * exampleBoxLayout = new QVBoxLayout(exampleBox);
m_example = new QLabel(caption, exampleBox, "example");
m_example->setFrameShape(Q3Frame::Box);
@@ -318,10 +311,15 @@
else
m_example->setFont(m_style.font());
- grid->addRowSpacing(5, 0);
+ exampleBoxLayout->addWidget(m_example);
+ exampleBoxLayout->addItem(new QSpacerItem(10, 10, QSizePolicy::Preferred, QSizePolicy::Expanding));
- QHBoxLayout* layout = new QHBoxLayout(grid);
- grid->addMultiCell(layout, 6, 6, 0, 2);
+ grid->addRow(exampleBox);
+
+ grid->setSpacing(5);
+
+ QHBoxLayout* layout = new QHBoxLayout();
+ grid->addRow(layout);
layout->addStretch();
QPushButton* ok = new QPushButton("OK", this);
connect(ok, SIGNAL(clicked()),
@@ -335,6 +333,7 @@
cancel->setDefault(true);
layout->addWidget(cancel);
layout->addStretch();
+
}
MessageTypeStyleDialog::~MessageTypeStyleDialog()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
