[prev in list] [next in list] [prev in thread] [next in thread]
List: atlantik-devel
Subject: [atlantik-cvs] CVS: kdegames/atlantik/client atlantik.cpp, 1.172,
From: kde () office ! kde ! org
Date: 2004-10-10 2:33:12
Message-ID: 41689F68.mail1591SUA4J () office ! kde ! org
[Download RAW message or body]
Update of /home/kde/kdegames/atlantik/client
In directory office:/tmp/cvs-serv1450/client
Modified Files:
atlantik.cpp atlantik.h
Log Message:
fix bug #69043
Index: atlantik.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.cpp,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- atlantik.cpp 8 Oct 2004 09:36:04 -0000 1.172
+++ atlantik.cpp 10 Oct 2004 02:33:10 -0000 1.173
@@ -19,7 +19,7 @@
#include <qcolor.h>
#include <qdatetime.h>
#include <qlineedit.h>
-#include <qscrollbar.h>
+#include <qscrollview.h>
#include <qpopupmenu.h>
#include <kaboutapplication.h>
@@ -159,11 +159,18 @@
setCentralWidget(m_mainWidget);
// Vertical view area for portfolios.
- m_portfolioWidget = new QWidget(m_mainWidget, "pfwidget");
- m_mainLayout->addWidget(m_portfolioWidget, 0, 0);
+ m_portfolioScroll = new QScrollView(m_mainWidget, "pfScroll");
+ m_mainLayout->addWidget( m_portfolioScroll, 0, 0 );
+ m_portfolioScroll->setHScrollBarMode( QScrollView::AlwaysOff );
+ m_portfolioScroll->setResizePolicy( QScrollView::AutoOneFit );
+ m_portfolioScroll->setFixedHeight( 200 );
+ m_portfolioScroll->hide();
+
+ m_portfolioWidget = new QWidget( m_portfolioScroll->viewport(), "pfWidget" );
+ m_portfolioScroll->addChild( m_portfolioWidget );
m_portfolioWidget->show();
- m_portfolioLayout = new QVBoxLayout(m_portfolioWidget);
+ m_portfolioLayout = new QVBoxLayout(m_portfolioWidget);
m_portfolioViews.setAutoDelete(true);
// Nice label
@@ -792,6 +799,8 @@
{
PortfolioView *portfolioView = new PortfolioView(m_atlanticCore, player, \
m_config.activeColor, m_config.inactiveColor, m_portfolioWidget); \
m_portfolioViews.append(portfolioView); + if ( m_portfolioViews.count() > 0 && \
m_portfolioScroll->isHidden() ) + m_portfolioScroll->show();
connect(player, SIGNAL(changed(Player *)), portfolioView, SLOT(playerChanged()));
connect(portfolioView, SIGNAL(newTrade(Player *)), m_atlantikNetwork, \
SLOT(newTrade(Player *)));
Index: atlantik.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- atlantik.h 6 Oct 2004 09:42:31 -0000 1.69
+++ atlantik.h 10 Oct 2004 02:33:10 -0000 1.70
@@ -29,6 +29,8 @@
#include "portfolioview.h"
#include "board.h"
+class QScrollView;
+
class AtlanticCore;
class AtlantikNetwork;
@@ -232,6 +234,7 @@
PortfolioView *addPortfolioView(Player *player);
PortfolioView *findPortfolioView(Player *player);
+ QScrollView *m_portfolioScroll;
QWidget *m_mainWidget, *m_portfolioWidget;
QGridLayout *m_mainLayout;
QVBoxLayout *m_portfolioLayout;
_______________________________________________
atlantik-cvs mailing list
atlantik-cvs@kde.org
https://mail.kde.org/mailman/listinfo/atlantik-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic