[prev in list] [next in list] [prev in thread] [next in thread]
List: atlantik-devel
Subject: [atlantik-cvs] CVS: kdeaddons/atlantikdesigner/designer boardinfo.cpp,1.5,1.6 designer.cpp,1.45,1.46
From: kde () office ! kde ! org
Date: 2002-10-05 5:27:09
[Download RAW message or body]
Update of /home/kde/kdeaddons/atlantikdesigner/designer
In directory office:/tmp/cvs-serv25521/designer
Modified Files:
boardinfo.cpp designer.cpp editor.cpp editor.h
Log Message:
fix up for release
Index: boardinfo.cpp
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/boardinfo.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- boardinfo.cpp 2002/06/26 07:59:20 1.5
+++ boardinfo.cpp 2002/10/05 05:27:06 1.6
@@ -24,7 +24,7 @@
setWFlags(WDestructiveClose);
- QFrame *about = addPage(i18n("About"));
+ QFrame *about = addPage(i18n("Information"));
QVBoxLayout *aboutLayout = new QVBoxLayout(about, spacingHint());
if (editable)
Index: designer.cpp
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/designer.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- designer.cpp 2002/07/09 02:19:58 1.45
+++ designer.cpp 2002/10/05 05:27:07 1.46
@@ -32,7 +32,8 @@
#include "editor.h"
#include "designer.h"
-AtlanticDesigner::AtlanticDesigner(QWidget *parent, const char *name) : KMainWindow(parent, name)
+AtlanticDesigner::AtlanticDesigner(QWidget *parent, const char *name)
+ : KMainWindow(parent, name)
{
firstBoard = true;
estates.setAutoDelete(true);
@@ -104,10 +105,10 @@
boardInfo = BoardInfo();
for (ConfigEstateGroupList::Iterator it = groups.begin(); it != groups.end(); ++it)
- if ((*it).name() == i18n("Default"))
+ if ((*it).name() == "Default")
return;
- ConfigEstateGroup defaultGroup(i18n("Default"));
+ ConfigEstateGroup defaultGroup("Default");
defaultGroup.setBgColor(defaultBg);
defaultGroup.setFgColor(defaultFg);
groups.append(defaultGroup);
@@ -132,6 +133,7 @@
editor = new EstateEdit(&groups, &estates, &cards, board->centerWidget(), "Estate Editor");
connect(editor, SIGNAL(goChecked(int)), this, SLOT(goChanged(int)));
connect(editor, SIGNAL(updateBackground()), this, SLOT(updateBackground()));
+ connect(editor, SIGNAL(resized()), board, SLOT(slotResizeAftermath()));
layout->addWidget(editor);
editor->setReady(false);
@@ -532,9 +534,9 @@
void AtlanticDesigner::setPlayerAtBeginning()
{
delete m_player;
+
// our superstar!
m_player = new Player;
- board->addToken(m_player);
ConfigEstate *go = 0;
for (go = estates.first(); go; go = estates.next())
@@ -545,6 +547,8 @@
go = estates.first();
movePlayer(go);
+ board->addToken(m_player);
+
editor->setEstate(go);
}
@@ -670,12 +674,12 @@
if (writtenGroups.contains((*it).name()) > 0)
continue;
- if ((*it).name() == i18n("Default"))
+ if ((*it).name() == "Default")
{
bool containsDefault = false;
for (estate = estates.first(); estate; estate = estates.next())
{
- if (estate->group() == i18n("Default"))
+ if (estate->group() == "Default")
{
containsDefault = true;
break;
Index: editor.cpp
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/editor.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- editor.cpp 2002/09/28 11:46:18 1.32
+++ editor.cpp 2002/10/05 05:27:07 1.33
@@ -1,4 +1,5 @@
#include <qcheckbox.h>
+#include <qevent.h>
#include <qframe.h>
#include <qhgroupbox.h>
#include <qlabel.h>
@@ -31,7 +32,7 @@
m_rent[0] = m_rent[1] = m_rent[2] = m_rent[3] = m_rent[4] = m_rent[5] = 0;
m_type = m_price = m_tax = m_taxPercentage = 0;
m_go = false;
- m_group = i18n("Default");
+ m_group = "Default";
}
void ConfigEstate::setChanged(bool b)
@@ -207,6 +208,11 @@
this->ready = ready;
}
+void EstateEdit::resizeEvent(QResizeEvent *)
+{
+ emit resized();
+}
+
void EstateEdit::setEstate(ConfigEstate *_estate)
{
if (!_estate)
@@ -501,7 +507,7 @@
value = 0;
- hlayout = new QHBoxLayout(this);
+ hlayout = new QHBoxLayout(this, KDialog::spacingHint());
typeCombo = new KComboBox(this);
QStringList _types(i18n("Pay"));
_types.append(i18n("Pay Each Player"));
@@ -618,8 +624,8 @@
choosies.setAutoDelete(true);
- layout = new QVBoxLayout(this, KDialog::spacingHint());
- QHBoxLayout *hlayout = new QHBoxLayout(layout);
+ layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ QHBoxLayout *hlayout = new QHBoxLayout(layout, KDialog::spacingHint());
addButton = new KPushButton(i18n("&Add Card..."), this);
connect(addButton, SIGNAL(clicked()), this, SLOT(add()));
@@ -637,9 +643,10 @@
layout->addWidget(List);
connect(List, SIGNAL(highlighted(int)), this, SLOT(selected(int)));
- layout->setStretchFactor(List, 3);
+ // it gets very big (and won't shrink) otherwise
+ List->setMaximumHeight(90);
- hlayout = new QHBoxLayout(layout);
+ hlayout = new QHBoxLayout(layout, KDialog::spacingHint());
moreButton = new KPushButton(i18n("&More Properties"), this);
connect(moreButton, SIGNAL(clicked()), this, SLOT(more()));
hlayout->addWidget(moreButton);
@@ -893,8 +900,8 @@
if (estate->group().isEmpty())
{
- groupCombo->setCurrentText(i18n("Default"));
- estate->setGroup(i18n("Default"));
+ groupCombo->setCurrentText("Default");
+ estate->setGroup("Default");
}
else
groupCombo->setCurrentText(estate->group());
Index: editor.h
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/editor.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- editor.h 2002/07/09 02:19:59 1.21
+++ editor.h 2002/10/05 05:27:07 1.22
@@ -127,7 +127,11 @@
void modified();
void updateBackground();
void goChecked(int id);
-
+ void resized();
+
+ protected:
+ void resizeEvent(QResizeEvent *);
+
private slots:
void configure();
void goToggled(bool);
_______________________________________________
atlantik-cvs mailing list
atlantik-cvs@mail.kde.org
http://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