projects
/
ptas
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4f429bb
)
made message table fit the width of the screen
author
Max Waterman
<davidmaxwaterman+maemogit@fastmail.co.uk>
Sun, 21 Mar 2010 08:18:29 +0000
(10:18 +0200)
committer
Max Waterman
<davidmaxwaterman+maemogit@fastmail.co.uk>
Sun, 21 Mar 2010 08:18:29 +0000
(10:18 +0200)
zouba/messagetable.cpp
patch
|
blob
|
history
zouba/messagetable.h
patch
|
blob
|
history
zouba/ui.cpp
patch
|
blob
|
history
zouba/ui.h
patch
|
blob
|
history
zouba/uicontroller.cpp
patch
|
blob
|
history
diff --git
a/zouba/messagetable.cpp
b/zouba/messagetable.cpp
index
d068bb9
..
6a5b84d
100644
(file)
--- a/
zouba/messagetable.cpp
+++ b/
zouba/messagetable.cpp
@@
-10,18
+10,27
@@
MessageTable::MessageTable( QWidget *parent ) :
{
setHorizontalHeaderLabels( QStringList() << "Messages" );
verticalHeader()->hide();
{
setHorizontalHeaderLabels( QStringList() << "Messages" );
verticalHeader()->hide();
- setMinimumSize( 250,0 );
+ //setMinimumSize( 800,0 );
+ //setMaximumSize( 800,480 );
+ //setSizePolicy(
+ //QSizePolicy::Fixed,
+ //QSizePolicy::Expanding
+ //);
for ( int row=0; row<NumberOfRows; ++row ) {
QTableWidgetItem *newRow = new QTableWidgetItem();
setItem( row,0, newRow );
}
for ( int row=0; row<NumberOfRows; ++row ) {
QTableWidgetItem *newRow = new QTableWidgetItem();
setItem( row,0, newRow );
}
+
+ horizontalHeader()->setStretchLastSection(true);
}
}
+
+/*
QSize MessageTable::minimumSizeHint() const
{
QSize size( QTableWidget::sizeHint() );
QSize MessageTable::minimumSizeHint() const
{
QSize size( QTableWidget::sizeHint() );
- size.setWidth( 250 );
+ size.setWidth( 800 );
return size;
}
return size;
}
@@
-29,6
+38,7
@@
QSize MessageTable::sizeHint() const
{
return minimumSizeHint();
}
{
return minimumSizeHint();
}
+*/
MessageTable::~MessageTable()
{
MessageTable::~MessageTable()
{
@@
-45,6
+55,4
@@
void MessageTable::displayMessage( const QString &message )
}
itemAt(0,0)->setText( message );
}
itemAt(0,0)->setText( message );
-
- resizeColumnsToContents();
}
}
diff --git
a/zouba/messagetable.h
b/zouba/messagetable.h
index
ea97a20
..
1d24c20
100644
(file)
--- a/
zouba/messagetable.h
+++ b/
zouba/messagetable.h
@@
-9,17
+9,19
@@
class MessageTable : public QTableWidget
Q_OBJECT
enum {
Q_OBJECT
enum {
- NumberOfRows=5,
+ NumberOfRows=20,
OneColumn=1
};
public:
OneColumn=1
};
public:
- MessageTable( QWidget *parent );
+ MessageTable( QWidget *parent=0 );
~MessageTable();
void displayMessage( const QString &message );
~MessageTable();
void displayMessage( const QString &message );
+ /*
QSize minimumSizeHint() const;
QSize sizeHint() const;
QSize minimumSizeHint() const;
QSize sizeHint() const;
+ */
};
#endif //MESSAGETABLE_H
};
#endif //MESSAGETABLE_H
diff --git
a/zouba/ui.cpp
b/zouba/ui.cpp
index
16d4616
..
32e7bd0
100644
(file)
--- a/
zouba/ui.cpp
+++ b/
zouba/ui.cpp
@@
-20,7
+20,7
@@
MessageTable *Ui::messageTable = 0;
Ui::Ui() :
centralWidget(0),
destinationButtons(0),
Ui::Ui() :
centralWidget(0),
destinationButtons(0),
- table(0)
+ routeTable(0)
{
}
{
}
@@
-70,22
+70,24
@@
void Ui::setupUi( QMainWindow *mainWindow )
buttonLayout->addWidget( workButton );
buttonLayout->addStretch();
buttonLayout->addWidget( workButton );
buttonLayout->addStretch();
- table = new QTableWidget( 1, 2 );
+ routeTable = new QTableWidget( 1, 2 );
QStringList columnHeaders;
columnHeaders << "Time" << "Bus";
QStringList columnHeaders;
columnHeaders << "Time" << "Bus";
- table->setHorizontalHeaderLabels( columnHeaders );
- table->verticalHeader()->hide();
+ routeTable->setHorizontalHeaderLabels( columnHeaders );
+ routeTable->verticalHeader()->hide();
QHBoxLayout *topLayout = new QHBoxLayout();
topLayout->addLayout( buttonLayout );
QHBoxLayout *topLayout = new QHBoxLayout();
topLayout->addLayout( buttonLayout );
- topLayout->addWidget( table );
+ topLayout->addWidget( routeTable );
- messageTable = new MessageTable( centralWidget );
+ messageTable = new MessageTable();
messageTable->setObjectName( QString::fromUtf8("messageTable") );
messageTable->setObjectName( QString::fromUtf8("messageTable") );
- QVBoxLayout *mainLayout = new QVBoxLayout( centralWidget );
+ QVBoxLayout *mainLayout = new QVBoxLayout();
mainLayout->addLayout( topLayout );
mainLayout->addWidget( messageTable );
mainLayout->addLayout( topLayout );
mainLayout->addWidget( messageTable );
+
+ centralWidget->setLayout( mainLayout );
}
void Ui::setHomeAddress()
}
void Ui::setHomeAddress()
diff --git
a/zouba/ui.h
b/zouba/ui.h
index
460dd88
..
4340f62
100644
(file)
--- a/
zouba/ui.h
+++ b/
zouba/ui.h
@@
-37,7
+37,7
@@
public:
QWidget *centralWidget;
QButtonGroup *destinationButtons;
QWidget *centralWidget;
QButtonGroup *destinationButtons;
- QTableWidget *table;
+ QTableWidget *routeTable;
static MessageTable *messageTable;
QHBoxLayout *mainLayout;
QVBoxLayout *buttonLayout;
static MessageTable *messageTable;
QHBoxLayout *mainLayout;
QVBoxLayout *buttonLayout;
diff --git
a/zouba/uicontroller.cpp
b/zouba/uicontroller.cpp
index
b599cbd
..
3d0e0ca
100644
(file)
--- a/
zouba/uicontroller.cpp
+++ b/
zouba/uicontroller.cpp
@@
-76,15
+76,13
@@
void UiController::displayRoute( const QList<RouteData> &routeData )
{
qDebug() << "displaying route";
{
qDebug() << "displaying route";
- ui->table->setRowCount( routeData.count() );
+ ui->routeTable->setRowCount( routeData.count() );
for ( int i=0; i<routeData.count(); i++ ) {
QTableWidgetItem *timeItem = new QTableWidgetItem( routeData.at(i).arrivalTime );
for ( int i=0; i<routeData.count(); i++ ) {
QTableWidgetItem *timeItem = new QTableWidgetItem( routeData.at(i).arrivalTime );
- ui->table->setItem( i, 0, timeItem );
+ ui->routeTable->setItem( i, 0, timeItem );
QTableWidgetItem *lineItem = new QTableWidgetItem( routeData.at(i).lineCode );
QTableWidgetItem *lineItem = new QTableWidgetItem( routeData.at(i).lineCode );
- ui->table->setItem( i, 1, lineItem );
+ ui->routeTable->setItem( i, 1, lineItem );
}
}
-
- ui->table->resizeColumnsToContents();
}
}